Merge of xfs-cmds-2.4.18:slinx:112273a by nathans.

  print out that we wrote a source tarball too.

diff --git a/build/Makefile b/build/Makefile
index 42d4eb6b44b9c96bf7b800c9d2d64464aeacee65..66030d8be4b388b550ded89f8b8ddab78868fefe 100644 (file)
--- 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 759b02b1e15393d341cd972c3f04296550355061..16cefee99ef16fc16026882d825d6fc713998581 100644 (file)
--- 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 >$@