Commit 948ec4c2 authored by Damien Fouilleul's avatar Damien Fouilleul

all: for Cygwin, make sure that the program-prefix is empty, so that...

all: for Cygwin, make sure that the program-prefix is empty, so that libgcrypt-config & gnutls-config are not prefixed by the target build (i586-mingw32msvc), which causes prevents configures scripts from detecting them
parent 6979ce05
...@@ -1475,7 +1475,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 ...@@ -1475,7 +1475,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
.gcrypt: libgcrypt .gpg-error .gcrypt: libgcrypt .gpg-error
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install) (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && make && make install)
else else
ifeq ($(HOST),i686-apple-darwin8) ifeq ($(HOST),i686-apple-darwin8)
(cd $<; ./autogen.sh) (cd $<; ./autogen.sh)
...@@ -1502,7 +1502,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 ...@@ -1502,7 +1502,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
.gnutls: gnutls .gcrypt .gpg-error .gnutls: gnutls .gcrypt .gpg-error
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --program-prefix="" && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install)
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make && cd ../lib &&make && make install && cd ../includes && make install)
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment