GNUmakefile: try to rebuild configure only if source dir is there.
configure: Fixed test for find -printf. psg: include f option on Linux.
This commit is contained in:
parent
0e3c5c7957
commit
e161a77792
|
@ -1,6 +1,7 @@
|
||||||
include GNUmakevars
|
include GNUmakevars
|
||||||
|
|
||||||
CONFDIR=../../configure
|
CONFDIR=../../configure
|
||||||
|
CONFDIR_exists=$(shell [ -d $(CONFDIR) ] && echo ok)
|
||||||
|
|
||||||
all: configure dus fnp fnpa fnpc fqdn isodate psg
|
all: configure dus fnp fnpa fnpc fqdn isodate psg
|
||||||
|
|
||||||
|
@ -27,7 +28,11 @@ fnpc: fnpc.sh
|
||||||
customize: configure
|
customize: configure
|
||||||
sh ./configure
|
sh ./configure
|
||||||
|
|
||||||
|
ifeq ($(CONFDIR_exists),ok)
|
||||||
|
|
||||||
configure: $(CONFDIR)/start $(CONFDIR)/find-printf $(CONFDIR)/finish
|
configure: $(CONFDIR)/start $(CONFDIR)/find-printf $(CONFDIR)/finish
|
||||||
cat $^ > $@
|
cat $^ > $@
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
include GNUmakerules
|
include GNUmakerules
|
||||||
|
|
|
@ -5,13 +5,14 @@ echo "sed \\" > customize.$$
|
||||||
chmod +x customize.$$
|
chmod +x customize.$$
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
|
# $Id: configure,v 1.2 2001-03-19 22:48:23 hjp Exp $
|
||||||
# find a ln which understands -sf
|
# find a ln which understands -sf
|
||||||
#
|
#
|
||||||
touch find-printf.$$.1
|
touch find-printf.$$.1
|
||||||
today=`date '+%Y-%m-%d'`
|
today=`date '+%Y-%m-%d'`
|
||||||
for i in /bin/find /usr/bin/find /usr/local/bin/find
|
for i in /bin/find /usr/bin/find /usr/local/bin/find
|
||||||
do
|
do
|
||||||
if [ "`$i find-printf.$$.1 -printf '%TY-%Tm-%Td %p`" = "$today find-printf.$$.1" ]
|
if [ "`$i find-printf.$$.1 -printf '%TY-%Tm-%Td %p'`" = "$today find-printf.$$.1" ]
|
||||||
then
|
then
|
||||||
echo $i works
|
echo $i works
|
||||||
find="$i"
|
find="$i"
|
||||||
|
@ -26,7 +27,17 @@ fi
|
||||||
echo " -e 's,@@@find@@@,$find,g' \\" >> customize.$$
|
echo " -e 's,@@@find@@@,$find,g' \\" >> customize.$$
|
||||||
rm find-printf.$$.?
|
rm find-printf.$$.?
|
||||||
|
|
||||||
|
# $Log: configure,v $
|
||||||
|
# Revision 1.2 2001-03-19 22:48:23 hjp
|
||||||
|
# GNUmakefile: try to rebuild configure only if source dir is there.
|
||||||
|
#
|
||||||
|
# configure: Fixed test for find -printf.
|
||||||
|
#
|
||||||
|
# psg: include f option on Linux.
|
||||||
|
#
|
||||||
|
# Revision 1.1 2001/03/19 22:44:39 hjp
|
||||||
|
# *** empty log message ***
|
||||||
|
#
|
||||||
################################################################
|
################################################################
|
||||||
# finish
|
# finish
|
||||||
# Add trailing newline and rename temp file to final name
|
# Add trailing newline and rename temp file to final name
|
||||||
|
|
Loading…
Reference in New Issue