aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2002-02-25 22:41:02 +0000
committerNathan Scott <nathans@sgi.com>2002-02-25 22:41:02 +0000
commit5d215ddc03d9fff15da0a4161dc7c0ae514fe0c2 (patch)
treede35264e5a39d0b5f8347053f25f5fbf202861ef
parent93caa858fc8e4f5484350299ffd2c256573850d6 (diff)
downloaddmapi-dev-5d215ddc03d9fff15da0a4161dc7c0ae514fe0c2.tar.gz
Merge of xfs-cmds-2.4.18:slinx:112273a by nathans.
sync up with patch from AndreasG, mainly creates libattr.rpm/deb.
-rw-r--r--build/Makefile1
-rw-r--r--build/rpm/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile
index 42d4eb6..66030d8 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -60,6 +60,7 @@ $(MANIFEST) : $(_FORCE)
else \
unset TAPE; \
$(TAR) -T $$CDIR/$@ -cf - | $(ZIP) --best > $$CDIR/$(SRCTAR); \
+ echo Wrote: $$CDIR/$(SRCTAR); \
fi
dist : default $(MANIFEST)
diff --git a/build/rpm/Makefile b/build/rpm/Makefile
index 759b02b..16cefee 100644
--- a/build/rpm/Makefile
+++ b/build/rpm/Makefile
@@ -49,7 +49,7 @@ dist : default $(SPECF) rpm-$(RPM_VERSION).rc
# Because rpm prior to v.2.90 does not support macros and old style config
# is not supported by rpm v.3, we have to resort to such ugly hacks
-ifneq ($RPM_VERSION,2)
+ifneq ($(RPM_VERSION),2)
rpm-$(RPM_VERSION).rc : rpmmacros
sed -e '/^macrofiles:/s|~/.rpmmacros|rpmmacros|' </usr/lib/rpm/rpmrc >$@