Makefile: Maintain generated configuration under `$(LOCAL)'.

diff --git a/Makefile b/Makefile
index aae33e4050ffb48663439e234779cdff0b065dd9..9dd6e1f73ae0c6610095457d5ff9645b0e7829fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -453,60 +453,66 @@ schroot-config:: $(STATE)/config.sh
 $(STATE)/config.sh: $(schroot-config_FILE)
        $(call v_tag,SYMLINK)ln -sf $(notdir $<) $@
 
 $(STATE)/config.sh: $(schroot-config_FILE)
        $(call v_tag,SYMLINK)ln -sf $(notdir $<) $@
 

-schroot-config:: $(STATE)/etc/schroot/sbuild.schroot
-$(STATE)/etc/schroot/sbuild.schroot: $(STATE)/bin/mkchrootconf
+schroot-config:: $(LOCAL)/etc/schroot/sbuild.schroot
+$(LOCAL)/etc/schroot/sbuild.schroot: $(STATE)/bin/mkchrootconf

        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN)$(STATE)/bin/mkchrootconf >$@.new && \
                $(ROOTLY) chown root:root $@.new && mv $@.new $@
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN)$(STATE)/bin/mkchrootconf >$@.new && \
                $(ROOTLY) chown root:root $@.new && mv $@.new $@

-check::; $(call check-symlink,WARN,/etc/schroot/chroot.d/sbuild,$(HERE)/$(STATE)/etc/schroot/sbuild.schroot)
+CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.schroot
+check::; $(call check-symlink,WARN,/etc/schroot/chroot.d/sbuild,$(HERE)/$(LOCAL)/etc/schroot/sbuild.schroot)

 
 

-schroot-config:: $(STATE)/etc/schroot/sbuild.profile/copyfiles
-$(STATE)/etc/schroot/sbuild.profile/copyfiles: $(schroot-config_STAMP)
+schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/copyfiles
+$(LOCAL)/etc/schroot/sbuild.profile/copyfiles: $(schroot-config_STAMP)

        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN){ \
          echo "### -*-conf-*- GENERATED by distorted-chroot: do not edit"; \
          for i in $(SCHROOT_COPYFILES); do echo "$$i"; done; \
        } >$@.new && mv $@.new $@
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN){ \
          echo "### -*-conf-*- GENERATED by distorted-chroot: do not edit"; \
          for i in $(SCHROOT_COPYFILES); do echo "$$i"; done; \
        } >$@.new && mv $@.new $@

+CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.profile/copyfiles

 
 

-schroot-config:: $(STATE)/etc/schroot/sbuild.profile/nssdatabases
-$(STATE)/etc/schroot/sbuild.profile/nssdatabases: $(schroot-config_STAMP)
+schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases
+$(LOCAL)/etc/schroot/sbuild.profile/nssdatabases: $(schroot-config_STAMP)

        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN){ \
          echo "### -*-conf-*- GENERATED by distorted-chroot: do not edit"; \
          for i in $(SCHROOT_NSSDATABASES); do echo "$$i"; done; \
        } >$@.new && mv $@.new $@
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN){ \
          echo "### -*-conf-*- GENERATED by distorted-chroot: do not edit"; \
          for i in $(SCHROOT_NSSDATABASES); do echo "$$i"; done; \
        } >$@.new && mv $@.new $@

+CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases

 
 

-schroot-config:: $(STATE)/etc/schroot/sbuild.profile/fstab
-$(STATE)/etc/schroot/sbuild.profile/fstab: \
+schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/fstab
+$(LOCAL)/etc/schroot/sbuild.profile/fstab: \

                etc/sbuild.fstab.in $(schroot-config_STAMP)
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,SUBST)$(call subst-file,### -*-conf-*-) \
                <$< >$@.new && mv $@.new $@
                etc/sbuild.fstab.in $(schroot-config_STAMP)
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,SUBST)$(call subst-file,### -*-conf-*-) \
                <$< >$@.new && mv $@.new $@

+CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.profile/fstab

 
 

-check::; $(call check-symlink,WARN,/etc/schroot/sbuild,$(HERE)/$(STATE)/etc/schroot/sbuild.profile)
+check::; $(call check-symlink,WARN,/etc/schroot/sbuild,$(HERE)/$(LOCAL)/etc/schroot/sbuild.profile)

 
 

-schroot-config:: $(STATE)/etc/sbuild.conf
-$(STATE)/etc/sbuild.conf: etc/sbuild.conf.in $(schroot-config_STAMP)
+schroot-config:: $(LOCAL)/etc/sbuild.conf
+$(LOCAL)/etc/sbuild.conf: etc/sbuild.conf.in $(schroot-config_STAMP)

        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
                <$< >$@.new && mv $@.new $@
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
                <$< >$@.new && mv $@.new $@

-check::; $(call check-symlink,WARN,/etc/sbuild/sbuild.conf,$(HERE)/$(STATE)/etc/sbuild.conf)
+CLEANFILES             += $(LOCAL)/etc/sbuild.conf
+check::; $(call check-symlink,WARN,/etc/sbuild/sbuild.conf,$(HERE)/$(LOCAL)/etc/sbuild.conf)

 check::; $(call check-executable,WARN,/usr/local.schroot/hacks/apt-get)
 
 SCHROOT_SCRIPTS                += 11private
 SCHROOT_SCRIPTS                += 15binfmt
 SCHROOT_SCRIPTS                += 51chrootenv
 check::; $(call check-executable,WARN,/usr/local.schroot/hacks/apt-get)
 
 SCHROOT_SCRIPTS                += 11private
 SCHROOT_SCRIPTS                += 15binfmt
 SCHROOT_SCRIPTS                += 51chrootenv

-COPY_SCHROOT_SCRIPTS    = $(addprefix $(STATE)/etc/schroot/setup.d/,$(SCHROOT_SCRIPTS))
+COPY_SCHROOT_SCRIPTS    = $(addprefix $(LOCAL)/etc/schroot/setup.d/,$(SCHROOT_SCRIPTS))

 schroot-config:: $(COPY_SCHROOT_SCRIPTS)
 $(COPY_SCHROOT_SCRIPTS): \
 schroot-config:: $(COPY_SCHROOT_SCRIPTS)
 $(COPY_SCHROOT_SCRIPTS): \

-               $(STATE)/etc/schroot/setup.d/%: etc/schroot-scripts/%
+               $(LOCAL)/etc/schroot/setup.d/%: etc/schroot-scripts/%

        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,COPY)cp $< $@.new && mv $@.new $@
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,COPY)cp $< $@.new && mv $@.new $@

+CLEANFILES             += $(COPY_SCHROOT_SCRIPTS)

 
 CHECK_SCHROOT_SCRIPTS   = $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 check:: $(CHECK_SCHROOT_SCRIPTS)
 $(CHECK_SCHROOT_SCRIPTS): check-script/%:
 
 CHECK_SCHROOT_SCRIPTS   = $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 check:: $(CHECK_SCHROOT_SCRIPTS)
 $(CHECK_SCHROOT_SCRIPTS): check-script/%:

-       $(call check-symlink,WARN,/etc/schroot/setup.d/$*,$(HERE)/$(STATE)/etc/schroot/setup.d/$*)
+       $(call check-symlink,WARN,/etc/schroot/setup.d/$*,$(HERE)/$(LOCAL)/etc/schroot/setup.d/$*)

 .PHONY: $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 
 ###--------------------------------------------------------------------------
 .PHONY: $(addprefix check-script/,$(SCHROOT_SCRIPTS))
 
 ###--------------------------------------------------------------------------