diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-04-08 04:55:47 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-04-08 04:55:47 +0000 |
| commit | fe00a16cfe5289d23d69af57477aab89bf18477e (patch) | |
| tree | 753bf0ff36386a8f716fd90cd4d5f3ab3b43df19 /packages | |
| parent | f34b32c425b8c23172f37fc93c31ec39bb952359 (diff) | |
created working ifeq test for autogen.sh, man Makefile's syntax is whacky
svn path=/trunk/; revision=10982
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packages/Makefile b/packages/Makefile index c3b61aef..218de2af 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -124,7 +124,14 @@ PD_BUILD_FLAGS = HAVE_AUTOGEN_SH := $(wildcard $(pd_src)/autogen.sh) # test for the new build system -ifeq ($(HAVE_AUTOGEN_SH)),) +ifeq (autogen.sh, $(findstring autogen.sh,$(HAVE_AUTOGEN_SH))) +# new autotools build system +pd: + cd $(pd_src) \ + && ./autogen.sh \ + && ./configure $(PD_CONFIGURE_FLAGS) \ + && make $(DEST_PATHS) $(PD_BUILD_FLAGS) +else # old build system PD_AUTOCONF = autoconf $(pd_src)/src/configure: $(pd_src)/src/configure.in @@ -143,13 +150,6 @@ pd: $(pd_src)/src/configure make OPT_CFLAGS="" depend && \ make $(DEST_PATHS) $(PD_BUILD_FLAGS) -else -# new autotools build system -pd: - cd $(pd_src) \ - && ./autogen.sh \ - && ./configure $(PD_CONFIGURE_FLAGS) \ - && make $(DEST_PATHS) $(PD_BUILD_FLAGS) endif @@ -697,4 +697,4 @@ test_locations: @echo "HELPDIR $(helpdir)" @echo "MANUALSDIR $(manualsdir)" @echo "EXAMPLESDIR $(examplesdir)" - @echo "HAVE_AUTOGEN_SH $(HAVE_AUTOGEN_SH)" + @echo "HAVE_AUTOGEN_SH --$(HAVE_AUTOGEN_SH)--" |