Build on solaris2.6 with gcc.

CVS patchset: 3362
CVS date: 1999/09/30 21:20:34

diff --git a/Makefile.am b/Makefile.am
index 2ec41f4..59f89e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/build \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/popt \
-       @INCPATH@ \
-       -I/usr/include \
-       -I$(top_srcdir)/misc
+       @INCPATH@
 
 mylibs=        $(top_builddir)/build/librpmbuild.la \
        $(top_builddir)/lib/librpm.la \

diff --git a/build/Makefile.am b/build/Makefile.am
index e2566e2..9efe29c 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -6,9 +6,7 @@ INCLUDES = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/popt \
-       @INCPATH@ \
-       -I/usr/include \
-       -I$(top_srcdir)/misc
+       @INCPATH@
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = rpmbuild.h rpmspec.h

diff --git a/configure.in b/configure.in
index d9f9ebe..ca4e4d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -890,6 +890,9 @@ testdir="`pwd`/tests"
 dnl AC_DEFINE_UNQUOTED(testdir, "$testdir")
 AC_SUBST(testdir)
 
+if test -n "$LIBOBJS"; then
+    INCPATH="$INCPATH -I\$(top_builddir)/misc"
+fi
 AC_SUBST(INCPATH)
 
 AC_SUBST(LIBS)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cee7a8a..fd61040 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,9 +6,7 @@ INCLUDES = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/build \
        -I$(top_srcdir)/popt \
-       @INCPATH@ \
-       -I/usr/include \
-       -I$(top_srcdir)/misc
+       @INCPATH@
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \

diff --git a/misc/Makefile.am b/misc/Makefile.am
index dba84c9..c939526 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 INCLUDES = \
        -I$(top_srcdir) \
-       @INCPATH@ \
-       -I$(top_srcdir}/misc
+       @INCPATH@
 
 EXTRA_DIST = \
        alloca.c        basename.c      err.c           error.c         \

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c065772..cc8b98a 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -165,7 +165,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 750e0c2..a28eed0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,9 +7,7 @@ INCLUDES = \
        -I$(top_srcdir)/build \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/popt \
-       @INCPATH@ \
-       -I/usr/include \
-       -I$(top_srcdir)/misc
+       @INCPATH@
 
 EXTRA_DIST =   fstrcmp.c message.c str-list.c rpmchecksig.c
 mylibs=        $(top_builddir)/build/.libs/librpmbuild.a \