From: hanwen <hanwen>
Date: Tue, 23 Sep 2003 11:59:45 +0000 (+0000)
Subject: * GNUmakefile.in ($(config_h)): config.h should depend on
X-Git-Tag: release/2.1.3~92
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf6b3ec129046d5a54710c9a62518222941a09ad;p=lilypond.git

* GNUmakefile.in ($(config_h)): config.h should depend on
config.hh.in .

* stepmake/aclocal.m4: only print config.cache warning if it exists.

* configure.in: remove pktrace reference.

* GNUmakefile.in (rsync-web): permissions and ownership for
website.
---

diff --git a/ChangeLog b/ChangeLog
index 3e8b7b451a..be6c0ef4e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2003-09-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* GNUmakefile.in ($(config_h)): config.h should depend on
+	config.hh.in .
+
+	* stepmake/aclocal.m4: only print config.cache warning if it exists.
+
+	* configure.in: remove pktrace reference.
+
+	* GNUmakefile.in (rsync-web): permissions and ownership for
+	website.
+
 	* lily/volta-engraver.cc (staff_eligible): new function.
 	(stop_translation_timestep): kill off spanners if not eligible.
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 99e4649d5b..ee0e344c60 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -151,7 +151,7 @@ local-clean: builddir-setup-clean
 builddir-setup-clean:
 	cd $(builddir) && rm -rf share
 
-$(config_h): configure.in aclocal.m4
+$(config_h): config.hh.in 
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,
@@ -168,6 +168,9 @@ $(config_h): configure.in aclocal.m4
 # maybe move into private script?
 rsync-web:
 	cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-	cd out-www/web && chgrp -R lilypond . 
-	cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
+	cd out-www/web && \
+	chgrp -R lilypond . && \
+	chmod -R  664 . && \
+	chmod 2775 `find -type d` . && \
+	rsync --group --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
 	cd out-www && rm -rf web/
diff --git a/configure.in b/configure.in
index a94f5c4a9c..74559b2711 100644
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, REQUIRED, 1.0.17)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.17)
 # new makeinfo for multi-page website docs
 STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 086c69befc..cfb197ce2e 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -314,7 +314,9 @@ AC_DEFUN(STEPMAKE_END, [
     if test -n "$OPTIONAL$REQUIRED$UNSUPPORTED"; then
 	echo
 	echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME"
-	echo "Remove config.cache before rerunning ./configure"
+	if [ -f config.cache ] ; then
+	    echo "Remove config.cache before rerunning ./configure"
+	fi 
     fi
     
     if test -n "$REQUIRED$UNSUPPORTED"; then