Commit 3d72675e authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Remove $(VERSIONFILE) dependencies

parent e4c84b9d
...@@ -8,13 +8,9 @@ ...@@ -8,13 +8,9 @@
all-common: $(LIBRARY) $(PROGRAMS) all-common: $(LIBRARY) $(PROGRAMS)
version.c: $(OBJS) $(srcdir)/Version.c version.c: $(OBJS)
$(RM) $@ $(RM) $@
(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \ $(MKVERSION) $(LIBRARY) > $@
h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-e "s|%VERSION%|$${v}|" \
< $(srcdir)/Version.c > $@)
install-common: FORCE install-common: FORCE
......
...@@ -10,10 +10,9 @@ MANDIR=$(mandir)/man$(MANSECT) ...@@ -10,10 +10,9 @@ MANDIR=$(mandir)/man$(MANSECT)
TMP_SUFFIX=tmp TMP_SUFFIX=tmp
all-common: all-common:
VERSION=`$(CAT) $(VERSIONFILE)`; \
PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \ PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
for page in $$PAGES; do \ for page in $$PAGES; do \
$(SED) -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$(VERSION)%" \
-e 's%ETCDIR%$(sysconfdir)%' \ -e 's%ETCDIR%$(sysconfdir)%' \
-e 's%LOCALSTATEDIR%$(localstatedir)%' \ -e 's%LOCALSTATEDIR%$(localstatedir)%' \
-e 's%SYSCONFDIR%$(sysconfdir)%' \ -e 's%SYSCONFDIR%$(sysconfdir)%' \
......
...@@ -2311,7 +2311,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ ...@@ -2311,7 +2311,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
for ac_prog in gawk mawk nawk awk for ac_prog in mawk gawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
...@@ -4154,7 +4154,7 @@ fi ...@@ -4154,7 +4154,7 @@ fi
ol_link_tls=no ol_link_tls=no
if test $ol_with_tls != no ; then if test $ol_with_tls != no ; then
for ac_hdr in ssl.h ssl/ssl.h for ac_hdr in ssl.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -4195,7 +4195,7 @@ fi ...@@ -4195,7 +4195,7 @@ fi
done done
if test $ac_cv_header_ssl_h = yes -o $ac_cv_header_ssl_ssl_h = yes ; then if test $ac_cv_header_ssl_h = yes ; then
echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6 echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6
echo "configure:4201: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 echo "configure:4201: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-%__p_%'` ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-%__p_%'`
......
Supports Markdown
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