I tried building pcp-2.3.0 on the United Linux 1.0 release candidate
and found there is no rpmbuild, only rpm. Here's a patch that
modifies Todd's changes so rpmbuild is used if available, otherwise
rpm is used.
Mike
diff -Naur pcp-2.3.0.2/build/rpm/GNUmakefile
pcp-2.3.0.1/build/rpm/GNUmakefile
--- pcp-2.3.0.2/build/rpm/GNUmakefile 2002-11-12 19:41:39.000000000 -0800
+++ pcp-2.3.0.1/build/rpm/GNUmakefile 2002-11-13 17:00:08.000000000 -0800
@@ -49,7 +49,7 @@
# Blow that spec away after rpm has finished its work - it IS
# going to make sure it'll be rebuild next time we come here
pack_pcp : rpm-$(RPM_VERSION).rc $(SPEC)
- $(RPMBUILD) -ba --rcfile rpm-$(RPM_VERSION).rc \
+ $(RPMPROG) -ba --rcfile rpm-$(RPM_VERSION).rc \
--target $(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS) \
$(SPEC)
diff -Naur pcp-2.3.0.2/configure.in pcp-2.3.0.1/configure.in
--- pcp-2.3.0.2/configure.in 2002-11-12 19:39:45.000000000 -0800
+++ pcp-2.3.0.1/configure.in 2002-11-13 17:03:23.000000000 -0800
@@ -202,6 +202,15 @@
rpm=$RPM
AC_SUBST(rpm)
+dnl if rpmbuild exists, use it, otherwise use rpm
+if test -x $RPMBUILD
+then
+ rpmprog=$RPMBUILD
+else
+ rpmprog=$RPM
+fi
+AC_SUBST(rpmprog)
+
dnl .. and what version is rpm
if test -x $RPM
then
diff -Naur pcp-2.3.0.2/src/include/builddefs.in
pcp-2.3.0.1/src/include/builddefs.in
--- pcp-2.3.0.2/src/include/builddefs.in 2002-11-12 19:39:47.000000000
-0800
+++ pcp-2.3.0.1/src/include/builddefs.in 2002-11-13 17:04:47.000000000
-0800
@@ -111,6 +111,7 @@
BZIP2 = @bzip2@
TAR = @tar@
RPMBUILD= @rpmbuild@
+RPMPROG = @rpmprog@
RPM = @rpm@
RPM_VERSION = @rpm_version@
GENDIST = @gendist@
--
Mike Mason
IBM Linux Technology Center, RAS Group
Beaverton, OR, USA
mmlnx@xxxxxxxxxx
(503) 578-4123
|