X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=5bfef90702ecb42883c61390be6b74db713023c8;hb=refs%2Fheads%2Fnm-one-spec;hp=499b3a2ad4c78a90b66e0b3f2bd3b4f60486ed42;hpb=ce6c06ce733acf2a62c4721c3d5e3864b3d8ad43;p=build.git

diff --git a/Makefile b/Makefile
index 499b3a2a..5bfef907 100644
--- a/Makefile
+++ b/Makefile
@@ -461,7 +461,7 @@ STATIC_VARS=PLDISTRO PLDISTROTAGS build-GITPATH PERSONALITY MAILTO BASE WEBPATH
 define assigned_varname
 $(if $(findstring =,$(1)),$(firstword $(subst =, ,$(1))) )
 endef
-ASSIGNED=$(foreach flag,$(MAKEFLAGS),$(call assigned_varname,$(flag)))
+ASSIGNED=$(filter-out stage1 stage1iter,$(foreach flag,$(MAKEFLAGS),$(call assigned_varname,$(flag))))
 SAVED_VARS=$(sort $(STATIC_VARS) $(ASSIGNED))
 envfrompreviousrun.mk:
 	@echo "# do not edit" > $@
@@ -704,6 +704,11 @@ endef
 
 $(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
 
+####################
+# debian meta-target
+ALL-DEBIAN := $(foreach target,$(ALL),$(target)-debian)
+debian: $(ALL-DEBIAN)
+
 ####################
 # very rough for now (one module per package), targets only sfa for now
 # the general idea here is, changing the specfile (for version number and all) is enough, and this
@@ -716,7 +721,7 @@ $(1)-debian: $(1)-tarball
 	$(call dpkgapt_install_local_debs,$(1))
 	$(call dpkgapt_install_stock_debs,$(1))
 	mkdir -p DEBIAN/$(1)
-	rsync -a MODULES/$(1)/ DEBIAN/$(1)/
+	rsync -a MODULES/$($(1).module)/ DEBIAN/$(1)/
 	make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian
 	$(call dpkgapt_uninstall_stock_debs,$(1))
 endef
@@ -783,7 +788,7 @@ clean-help:
 distclean1:
 	rm -rf envfrompreviousrun.mk .rpmmacros spec2make header.spec SPECS MAKE $(DISTCLEANS)
 distclean2:
-	rm -rf MODULES SOURCES BUILD BUILDROOT RPMS SRPMS tmp
+	rm -rf MODULES SOURCES BUILD BUILDROOT RPMS SRPMS DEBIAN tmp
 distclean: distclean1 distclean2
 .PHONY: distclean1 distclean2 distclean