diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-29 15:10:06 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-29 15:10:06 +0000 |
| commit | 873763473f59fd68d57baeeb7f4e5d77641398b9 (patch) | |
| tree | 85becb0085ba8625ad11ce005ed4c885b45f9bff | |
| parent | 52463124be82988bf0ba77a978deacdd84d48be7 (diff) | |
| download | php-git-873763473f59fd68d57baeeb7f4e5d77641398b9.tar.gz | |
fixes
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | scripts/preconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index d8a4214119..e3f62ef77e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -87,7 +87,7 @@ php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@ $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules -libphp4.a libmodphp4.a: all-recursive $(OBJS) +libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@ $(AR) $@.tmp $(OBJS) $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@ @rm -f $@.tmp diff --git a/scripts/preconfig b/scripts/preconfig index 60b7f970ac..59b48fe545 100755 --- a/scripts/preconfig +++ b/scripts/preconfig @@ -10,7 +10,7 @@ if test -w configure.in.new || test -w acconfig.h.new ; then exit 1 fi -makefileams=`find ext -name Makefile.am -print` +makefileams=`find ext -name Makefile.am -print | sort` makefiles=`echo $makefileams | sed -e 's/\.am//g'` echo "dnl $disclaimer" > configure.in.new sed -e "s#@@EXT_MAKEFILES@@#$makefiles#" configure.in.in >> configure.in.new |