[Ocfs-tools-commits] rev 4 - trunk
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Mar 3 17:46:20 CST 2004
Author: manish
Date: 2004-03-03 17:46:18 -0600 (Wed, 03 Mar 2004)
New Revision: 4
Modified:
trunk/Config.make.in
trunk/Makefile
trunk/configure.in
Log:
Use $(CURDIR) to define RPM_TOPDIR, and not configure
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2004-03-02 22:14:00 UTC (rev 3)
+++ trunk/Config.make.in 2004-03-03 23:46:18 UTC (rev 4)
@@ -49,5 +49,3 @@
OCFS_MEMDEBUG = @OCFS_MEMDEBUG@
OCFS_TRACE = @OCFS_TRACE@
OCFS_PROCESSOR = @OCFS_PROCESSOR@
-
-RPM_TOPDIR = @RPM_TOPDIR@
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2004-03-02 22:14:00 UTC (rev 3)
+++ trunk/Makefile 2004-03-03 23:46:18 UTC (rev 4)
@@ -2,6 +2,8 @@
include $(TOPDIR)/Preamble.make
+RPM_TOPDIR = $(CURDIR)
+
RPMBUILD = $(shell /usr/bin/which rpmbuild 2>/dev/null || /usr/bin/which rpm 2>/dev/null || echo /bin/false)
SUSEBUILD = $(shell if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release; then echo yes; else echo no; fi)
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2004-03-02 22:14:00 UTC (rev 3)
+++ trunk/configure.in 2004-03-03 23:46:18 UTC (rev 4)
@@ -87,11 +87,6 @@
AC_PATH_PROG(AR, ar)
-AC_MSG_CHECKING([absolute rpm file directory])
-RPM_TOPDIR="`pwd`"
-AC_MSG_RESULT([$RPM_TOPDIR])
-AC_SUBST(RPM_TOPDIR)
-
AC_HEADER_STDC
AC_C_CONST
More information about the Ocfs-tools-commits
mailing list