X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=385a61b4158fb10b0626e1f238de820a2639dfcc;hb=10305ae52357af05705212767be3afd272ac350d;hp=6a89f029fcd39be8bb60e3881898f861cca0019c;hpb=1ba6e0aeb5949d0828aa2635d222f5257cd27ad5;p=build.git diff --git a/Makefile b/Makefile index 6a89f029..385a61b4 100644 --- a/Makefile +++ b/Makefile @@ -662,11 +662,14 @@ $(foreach package,$(ALL),$(eval $(call target_depends,$(package)))) # 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 # gets passed to "make debian" in the module +# PREFIX: at one point we had passed PREFIX=/usr to this 'make debian' +# however it turned out we could manage this some other way (see manifold) +# so I'm reverting to simplicity define target_debian $(1)-debian: $(1)-tarball mkdir -p DEBIAN/$(1) rsync -a MODULES/$(1)/ DEBIAN/$(1)/ - make -C DEBIAN/$(1) debian "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" PREFIX=/usr + make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian endef $(foreach package,$(ALL),$(eval $(call target_debian,$(package))))