diff --git a/aldor/configure b/aldor/configure index 1535341d..e9153927 100755 --- a/aldor/configure +++ b/aldor/configure @@ -13807,7 +13807,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$safe_CFLAGS -git_build_id="" +gitid=false if test "$ld_has_build_id" = ""; then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -13825,19 +13825,20 @@ then : esac else $as_nop if test -f $srcdir/../.git/config ; then gitid=true; else gitid=false; fi - if test $gitid = true; then git_build_id=1; fi fi # Git SHA1 hash as ld build-id. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: gitid $gitid ld: $ld_has_build_id " >&5 +printf "%s\n" "$as_me: gitid $gitid ld: $ld_has_build_id " >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build id" >&5 printf %s "checking build id... " >&6; } -if test yes = "$ld_has_build_id" && test 1 = "$git_build_id"; then +if test yes = "$ld_has_build_id" && test true = "$gitid"; then VCSVERSION=`cd $srcdir; git rev-parse HEAD` build_id="-Wl,--build-id=0x$VCSVERSION" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: git: $VCSVERSION ld: yes" >&5 printf "%s\n" "git: $VCSVERSION ld: yes" >&6; } -elif test 1 = "$git_build_id"; then +elif test true = "$gitid"; then VCSVERSION=`cd $srcdir; git rev-parse HEAD` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: git: $VCSVERSION ld: no" >&5 printf "%s\n" "git: $VCSVERSION ld: no" >&6; } diff --git a/aldor/lib/aldor/src/Makefile.in b/aldor/lib/aldor/src/Makefile.in index c621c396..d13dcf6c 100644 --- a/aldor/lib/aldor/src/Makefile.in +++ b/aldor/lib/aldor/src/Makefile.in @@ -1559,19 +1559,11 @@ $(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) $(AM_V_LIBSRCJAR) \ rm -rf sources-jar; \ $(MKDIR_P) sources-jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ + for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname)-sources.jar); \ do (cd sources-jar; jar xf ../$$i); done; \ (cd sources-jar; jar cf ../$@ .); \ rm -rf sources-jar -$(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) - $(AM_V_LIBSRCJAR) \ - rm -rf jar; \ - mkdir jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ - do (cd jar; jar xf ../$$i); done; \ - (cd jar; jar cf ../$@ .) - $(patsubst %,prereq-%,$(SUBDIRS)): prereq-%: $(AM_V_PREREQ) \ for dir in $(call lst_prefix,$*,$(SUBDIRS)); do \ diff --git a/aldor/lib/algebra/src/Makefile.in b/aldor/lib/algebra/src/Makefile.in index 0200f55c..33877f48 100644 --- a/aldor/lib/algebra/src/Makefile.in +++ b/aldor/lib/algebra/src/Makefile.in @@ -3021,19 +3021,11 @@ $(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) $(AM_V_LIBSRCJAR) \ rm -rf sources-jar; \ $(MKDIR_P) sources-jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ + for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname)-sources.jar); \ do (cd sources-jar; jar xf ../$$i); done; \ (cd sources-jar; jar cf ../$@ .); \ rm -rf sources-jar -$(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) - $(AM_V_LIBSRCJAR) \ - rm -rf jar; \ - mkdir jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ - do (cd jar; jar xf ../$$i); done; \ - (cd jar; jar cf ../$@ .) - $(patsubst %,prereq-%,$(SUBDIRS)): prereq-%: $(AM_V_PREREQ) \ for dir in $(call lst_prefix,$*,$(SUBDIRS)); do \ diff --git a/aldor/lib/ax0/src/Makefile.in b/aldor/lib/ax0/src/Makefile.in index be8dabb5..85116a2c 100644 --- a/aldor/lib/ax0/src/Makefile.in +++ b/aldor/lib/ax0/src/Makefile.in @@ -737,19 +737,11 @@ $(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) $(AM_V_LIBSRCJAR) \ rm -rf sources-jar; \ $(MKDIR_P) sources-jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ + for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname)-sources.jar); \ do (cd sources-jar; jar xf ../$$i); done; \ (cd sources-jar; jar cf ../$@ .); \ rm -rf sources-jar -$(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) - $(AM_V_LIBSRCJAR) \ - rm -rf jar; \ - mkdir jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ - do (cd jar; jar xf ../$$i); done; \ - (cd jar; jar cf ../$@ .) - $(patsubst %,prereq-%,$(SUBDIRS)): prereq-%: $(AM_V_PREREQ) \ for dir in $(call lst_prefix,$*,$(SUBDIRS)); do \ diff --git a/aldor/lib/axldem/src/Makefile.in b/aldor/lib/axldem/src/Makefile.in index f92228a8..e3fbbe45 100644 --- a/aldor/lib/axldem/src/Makefile.in +++ b/aldor/lib/axldem/src/Makefile.in @@ -954,19 +954,11 @@ $(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) $(AM_V_LIBSRCJAR) \ rm -rf sources-jar; \ $(MKDIR_P) sources-jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ + for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname)-sources.jar); \ do (cd sources-jar; jar xf ../$$i); done; \ (cd sources-jar; jar cf ../$@ .); \ rm -rf sources-jar -$(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) - $(AM_V_LIBSRCJAR) \ - rm -rf jar; \ - mkdir jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ - do (cd jar; jar xf ../$$i); done; \ - (cd jar; jar cf ../$@ .) - $(patsubst %,prereq-%,$(SUBDIRS)): prereq-%: $(AM_V_PREREQ) \ for dir in $(call lst_prefix,$*,$(SUBDIRS)); do \ diff --git a/aldor/lib/axllib/src/Makefile.in b/aldor/lib/axllib/src/Makefile.in index 8fd023a8..af4bfc7e 100644 --- a/aldor/lib/axllib/src/Makefile.in +++ b/aldor/lib/axllib/src/Makefile.in @@ -1136,19 +1136,11 @@ $(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) $(AM_V_LIBSRCJAR) \ rm -rf sources-jar; \ $(MKDIR_P) sources-jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ + for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname)-sources.jar); \ do (cd sources-jar; jar xf ../$$i); done; \ (cd sources-jar; jar cf ../$@ .); \ rm -rf sources-jar -$(libraryname)-sources.jar: $(foreach i, $(JAVA_SUBDIRS),$i/$(libraryname).jar) - $(AM_V_LIBSRCJAR) \ - rm -rf jar; \ - mkdir jar; \ - for i in $(foreach j, $(JAVA_SUBDIRS),$j/$(libraryname).jar); \ - do (cd jar; jar xf ../$$i); done; \ - (cd jar; jar cf ../$@ .) - $(patsubst %,prereq-%,$(SUBDIRS)): prereq-%: $(AM_V_PREREQ) \ for dir in $(call lst_prefix,$*,$(SUBDIRS)); do \