patches/duma/2_5_1/110-separate_cpp.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Apr 26 19:55:59 2012 -0600 (2012-04-26)
changeset 2939 58974be61289
parent 236 42650dc4e95e
permissions -rw-r--r--
Allow multi-word "install" command.

Autoconf can determine that the correct install command includes flags,
e.g., "/usr/bin/install -c". When using this as a command, we can't
enclose the value in double-quotes, as that makes some shells use the
whole expression as a filename:

# this is the value returned by autoconf and stored in CT_install
$ ins="/usr/bin/install -c"

# if we call it with quotes, the command is not found
$ "${ins}"
bash: /usr/bin/install -c: No such file or directory

# removing the quotes lets it work as expected
$ ${ins}
/usr/bin/install: missing file operand
Try `/usr/bin/install --help' for more information.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
yann@236
     1
diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile
yann@236
     2
--- duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
yann@236
     3
+++ duma_2_5_1/Makefile	2007-07-11 17:50:46.000000000 +0200
yann@236
     4
@@ -115,9 +115,14 @@
yann@236
     5
 	dumatest.c tstheap.c dumatestpp.cpp testoperators.cpp \
yann@236
     6
 	createconf.c
yann@236
     7
 
yann@236
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@236
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@236
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@236
    11
+
yann@236
    12
+ifeq ($(DUMA_CPP),1)
yann@236
    13
+OBJECTS += dumapp.o
yann@236
    14
+SO_OBJECTS += dumapp_so.o
yann@236
    15
+endif
yann@236
    16
 
yann@236
    17
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@236
    18
 
yann@236
    19
 all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
yann@236
    20
 	@ echo "Testing DUMA."