CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/07/23 10:37:39
Modified files:
windows : GNUmakefile
Log message:
Bugfixes and cleanup.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.22 installers/windows/GNUmakefile:1.23
--- installers/windows/GNUmakefile:1.22 Sat Jul 23 09:24:26 2005
+++ installers/windows/GNUmakefile Sat Jul 23 10:37:39 2005
@@ -62,16 +62,12 @@
installer = $(build-dir)/setup.exe
upgrader = $(build-dir)/upgrade.exe
-.PHONY: all clean nsis-root setup target-root upset $(packages)
+.PHONY: all clean nsis-root target-root upset $(packages)
.PRECIOUS: $(packages:%=$(escaped-upload-dir)/%/setup.hint) nsis/upgrade.nsi
.PRECIOUS: $(packages:%=$(src-dir)/.%-stamp) nsis/upgrade.nsi
-setup = .setup-stamp
-
default: setup all
-setup: .setup-stamp $(target-root)/.stamp $(nsis-root)/.stamp
-
all: $(installer) $(upgrader)
$(installer): $(nsis-packages:%=$(nsis-root)/etc/setup/%.lst.gz)
nsis/lilypond.nsi
@@ -87,10 +83,13 @@
$(bin-dir)/min-apt: $(bin-dir)/cyg-apt
ln -s $< $@
+
+# Refreshing setup.ini only works when the local uploads dir is
+# complete otherwise setup.ini gets overwritten with a partial package
+# list
+complete = $(wildcard $(upload-dir)/lilypond/lilypond*-src.tar.bz2)
upset:
-# ugh, this only works when the local uploads dir is complete
-# otherwise setup.ini gets overwritten with a partial package list
-ifeq (0,1)
+ifneq ($(complete),)
cd $(dir $(upload-dir)) && $(UPSET) --nosetup-version uploads >
uploads/../setup.ini
$(APT) --root=$(target-root) update
$(APT) --root=$(nsis-root) update
@@ -106,12 +105,12 @@
$(MAKE) short-circuit= upset
$(ASSUME_OLD)
-$(target-root)/.stamp:
+$(target-root)/.stamp: .setup-stamp
mkdir -p $(dir $@)
$(ASSUME_OLD)
$(APT) --root=$(dir $@) setup
-$(nsis-root)/.stamp:
+$(nsis-root)/.stamp: $(target-root)/.stamp
mkdir -p $(dir $@)
$(ASSUME_OLD)
$(APT) --root=$(dir $@) setup
@@ -255,3 +254,5 @@
# Building a package depends on an unpacked source tree
$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/.$(i)-stamp))
+mingw-build: $(target-root)/.stamp
+$(mingw-build): $(target-root)/.stamp
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
