diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-14 10:24:07 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-14 10:24:07 +0000 |
| commit | 57cef56faedfd7efb272610c6a673d4ea0d29b0b (patch) | |
| tree | dd49994b1b230464ec5ca0d527291bf8695ac1ac /Makefile.in | |
| parent | 64f092c0a46b3d592db231947b930e9c1a5aa524 (diff) | |
| download | quilt-57cef56faedfd7efb272610c6a673d4ea0d29b0b.tar.gz | |
- Use better variable names to avoid name clashes.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 56719f0..5d8c11e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,9 +14,7 @@ localedir := $(datadir)/locale etcdir := $(subst /usr/etc,/etc,$(prefix)/etc) QUILT_DIR = $(datadir)/$(PACKAGE) -SCRIPTS_DIR = $(QUILT_DIR)/scripts -COMPAT_DIR = $(QUILT_DIR)/compat -LIB_DIR = $(libdir)/$(PACKAGE) +QUILT_LIB = $(libdir)/$(PACKAGE) INSTALL := @INSTALL@ POD2MAN := @POD2MAN@ @@ -47,7 +45,7 @@ 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)) + $(BUILD_ROOT)$(QUILT_DIR)/compat/$(strip $(1)) endef $(foreach symlink,$(COMPAT_SYMLINKS),$(eval $(call COMPAT_SYMLINK_install, $(symlink)))) @@ -259,9 +257,8 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile $(patsubst %.in,%,$(wildcard quilt/*.in scripts/*.in)) :: Makefile % :: %.in @echo "$< -> $@" >&2 - @sed -e 's:@LIB''@:$(LIB_DIR):g' \ - -e 's:@QUILT''@:$(QUILT_DIR):g' \ - -e 's:@SCRIPTS''@:$(SCRIPTS_DIR):g' \ + @sed -e 's:@QUILT_LIB''@:$(QUILT_LIB):g' \ + -e 's:@QUILT_DIR''@:$(QUILT_DIR):g' \ -e 's:@PERL''@:$(PERL):g' \ -e 's:@BASH''@:$(BASH):g' \ -e 's:@VERSION''@:$(VERSION):g' \ @@ -285,14 +282,14 @@ install-main :: $(INSTALL) -d $(BUILD_ROOT)$(QUILT_DIR) $(INSTALL) -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/ - $(INSTALL) -d $(BUILD_ROOT)$(SCRIPTS_DIR) + $(INSTALL) -d $(BUILD_ROOT)$(QUILT_DIR)/scripts $(INSTALL) -m 755 $(patsubst %,scripts/%, \ $(filter-out patchfns,$(SCRIPTS))) \ - $(BUILD_ROOT)$(SCRIPTS_DIR) - $(INSTALL) -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR) + $(BUILD_ROOT)$(QUILT_DIR)/scripts + $(INSTALL) -m 644 scripts/patchfns $(BUILD_ROOT)$(QUILT_DIR)/scripts - $(INSTALL) -d $(BUILD_ROOT)$(LIB_DIR) - $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/ + $(INSTALL) -d $(BUILD_ROOT)$(QUILT_LIB) + $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(QUILT_LIB)/ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ $(INSTALL) -m 644 doc/README \ @@ -309,11 +306,11 @@ install-main :: $(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/ install-compat: - @rm -rf $(BUILD_ROOT)$(COMPAT_DIR) + @rm -rf $(BUILD_ROOT)$(QUILT_DIR)/compat ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),) - $(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR) + $(INSTALL) -d $(BUILD_ROOT)$(QUILT_DIR)/compat ifneq ($(COMPAT_PROGRAMS),) - $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR) + $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(QUILT_DIR)/compat endif endif @@ -322,7 +319,7 @@ install: scripts install-main install-compat \ uninstall :: rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%) \ - $(BUILD_ROOT)$(LIB_DIR) \ + $(BUILD_ROOT)$(QUILT_LIB) \ $(BUILD_ROOT)$(QUILT_DIR) \ $(patsubst %,$(BUILD_ROOT)$(mandir)/man1/%, \ $(notdir $(MAN1))) \ |