Makefile: Abolish `$(HERE)' as a bad idea.

Instead, there is `$(ABSLOCAL)', which was all it was being used for
anyway.

diff --git a/Makefile b/Makefile
index 6870ddc5eaf6c80cb542f395f5a1b88e33475700..7e622e9461e862e04c430b4b63aee25450a9075d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,6 @@ CONFIG_VARS           =
 ## Level of pickiness to aspire to.
 NOTIFY_FATAL            = 1
 
 ## Level of pickiness to aspire to.
 NOTIFY_FATAL            = 1
 

-## Path to this working tree.
-CONFIG_VARS            += HERE
-HERE                    = $(abspath .)
-

 ## Volume group from which to allocate chroot volumes and snapshots.
 CONFIG_VARS            += VG LVPREFIX
 VG                      = vg-$(shell hostname)
 ## Volume group from which to allocate chroot volumes and snapshots.
 CONFIG_VARS            += VG LVPREFIX
 VG                      = vg-$(shell hostname)


@@ -208,8 +204,9 @@ STATE                        = state
 
 ## A directory which will be spliced into chroots as `/usr/local.schroot/'.
 ## This will be our primary point of contact with the chroot.
 
 ## A directory which will be spliced into chroots as `/usr/local.schroot/'.
 ## This will be our primary point of contact with the chroot.

-CONFIG_VARS            += LOCAL
+CONFIG_VARS            += LOCAL ABSLOCAL

 LOCAL                   = local.schroot
 LOCAL                   = local.schroot

+ABSLOCAL                = $(abspath $(LOCAL))

 
 ## How to run a command as a privileged user.
 CONFIG_VARS            += ROOTLY
 
 ## How to run a command as a privileged user.
 CONFIG_VARS            += ROOTLY


@@ -531,7 +528,7 @@ $(LOCAL)/etc/schroot/sbuild.schroot: $(STATE)/bin/mkchrootconf
        $(call v_tag,GEN)$(STATE)/bin/mkchrootconf >$@.new && \
                $(ROOTLY) chown root:root $@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.schroot
        $(call v_tag,GEN)$(STATE)/bin/mkchrootconf >$@.new && \
                $(ROOTLY) chown root:root $@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.schroot

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

 
 schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/copyfiles
 $(LOCAL)/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)


@@ -559,7 +556,7 @@ $(LOCAL)/etc/schroot/sbuild.profile/fstab: \
                <$< >$@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.profile/fstab
 
                <$< >$@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/schroot/sbuild.profile/fstab
 

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

 
 schroot-config:: $(LOCAL)/etc/sbuild.conf
 $(LOCAL)/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)


@@ -567,7 +564,7 @@ $(LOCAL)/etc/sbuild.conf: etc/sbuild.conf.in $(schroot-config_STAMP)
        $(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
                <$< >$@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/sbuild.conf
        $(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
                <$< >$@.new && mv $@.new $@
 CLEANFILES             += $(LOCAL)/etc/sbuild.conf

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

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


@@ -584,7 +581,7 @@ 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)/$(LOCAL)/etc/schroot/setup.d/$*)
+       $(call check-symlink,WARN,/etc/schroot/setup.d/$*,$(ABSLOCAL)/etc/schroot/setup.d/$*)

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