[Quilt-dev] [patch 2/4] makefile cleanup

[John Vandenberg]

Move symlink installation inline in `install' target
Remove unused MTA substitute
Make target `install' depends on `all'
 
 Makefile.in |   49 ++++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

--- quilt-local.orig/Makefile.in
+++ quilt-local/Makefile.in
@@ -42,16 +42,6 @@ SENDMAIL :=  @SENDMAIL@
 COMPAT_SYMLINKS        := @COMPAT_SYMLINKS@
 COMPAT_PROGRAMS        := @COMPAT_PROGRAMS@
 
-default: all
-
-define COMPAT_SYMLINK_install
-install-compat-symlink-$(strip $(1)): install-compat
-       ln -sf $($(shell echo $(1) | $(AWK) '{print toupper($$1)}')) \
-              $(BUILD_ROOT)$(COMPAT_DIR)/$(strip $(1))
-endef
-
-$(foreach symlink,$(COMPAT_SYMLINKS),$(eval $(call COMPAT_SYMLINK_install, 
$(symlink))))
-
 CC :=          @CC@
 CPPFLAGS +=    @CPPFLAGS@ @DEFS@
 CFLAGS +=      @CFLAGS@
@@ -91,8 +81,8 @@ SCRIPTS :=    $(SCRIPTS_IN)
 SRC +=         $(SCRIPTS_SRC:%=scripts/%)
 DIRT +=                $(SCRIPTS_IN:%=scripts/%)
 
-SRC +=         $(wildcard compat/*.in) $(wildcard compat/*.sh)
-DIRT +=                $(patsubst %.in,%,$(wildcard compat/*.in)) 
compat/compatfns
+SRC +=         $(wildcard compat/*.in)
+DIRT +=                $(patsubst %.in,%,$(wildcard compat/*.in))
 
 LIB_SRC :=     backup-files.c
 LIB :=         backup-files$(EXEEXT)
@@ -261,10 +251,10 @@ define substitute
             -e 's:@BASH''@:$(BASH):g' \
             -e 's:@VERSION''@:$(VERSION):g' \
             -e 's:@RELEASE''@:$(RELEASE):g' \
-            -e 's:@MTA''@:$(MTA):g' \
             -e 's:@LOCALEDIR''@:$(localedir):g' \
             -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
             $< > $@
+
 endef
 
 $(patsubst %.in,%,$(wildcard */*.in)) : Makefile
@@ -280,7 +270,13 @@ Makefile : Makefile.in
        @echo "Please run ./configure"
        @false
 
-install-main ::
+define COMPAT_SYMLINK_install
+       ln -s $($(shell echo $(1) | $(AWK) '{print toupper($$1)}')) \
+              $(BUILD_ROOT)$(COMPAT_DIR)/$(strip $(1))
+
+endef
+
+install :: all
        $(INSTALL) -d $(BUILD_ROOT)$(bindir)
        $(INSTALL) -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/
 
@@ -296,6 +292,17 @@ install-main ::
        $(INSTALL) -d $(BUILD_ROOT)$(LIB_DIR)
        $(INSTALL) -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
 
+       $(if $(shell ls -d $(BUILD_ROOT)$(COMPAT_DIR) 2>/dev/null), \
+                 rm -rf $(BUILD_ROOT)$(COMPAT_DIR))
+ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),)
+       $(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR)
+ifneq ($(COMPAT_PROGRAMS),)
+       $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) 
$(BUILD_ROOT)$(COMPAT_DIR)
+endif
+endif
+       $(foreach symlink, $(COMPAT_SYMLINKS), \
+               $(call COMPAT_SYMLINK_install, $(symlink)))
+
        $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
        $(INSTALL) -m 644 doc/README \
                $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
@@ -310,18 +317,6 @@ install-main ::
        $(INSTALL) -m 644 bash_completion 
$(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt
        $(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/
 
-install-compat:
-       @rm -rf $(BUILD_ROOT)$(COMPAT_DIR)
-ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),)
-       $(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR)
-ifneq ($(COMPAT_PROGRAMS),)
-       $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) 
$(BUILD_ROOT)$(COMPAT_DIR)
-endif
-endif
-
-install: scripts install-main install-compat \
-        $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
-
 uninstall ::
        rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%) \
               $(BUILD_ROOT)$(LIB_DIR) \
@@ -340,7 +335,7 @@ distclean : clean
        rm -rf autom4te.cache/
 
 ifneq ($(MSGFMT),)
-install-main ::
+install ::
        for lang in $(LINGUAS) ; do \
                install -d $(BUILD_ROOT)$(localedir)/$$lang/LC_MESSAGES ; \
                install -m 644 po/$$lang.mo \

--
John