summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1999-09-26 17:28:00 +0000
committerjbj <devnull@localhost>1999-09-26 17:28:00 +0000
commitbc0955ad3c26524eef366a9e66a889d38a05b12f (patch)
treeef02eedc5ce148670d49fc134a493cd592a7305d /Makefile.am
parentd6f997e62d7bce0f24623ba8acfe3280fd6caf82 (diff)
downloadrpm-bc0955ad3c26524eef366a9e66a889d38a05b12f.tar.gz
rpm-bc0955ad3c26524eef366a9e66a889d38a05b12f.tar.bz2
rpm-bc0955ad3c26524eef366a9e66a889d38a05b12f.zip
Solaris compilation.
CVS patchset: 3332 CVS date: 1999/09/26 17:28:00
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 4817cb78a..a2024fa94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,13 @@ INCLUDES = \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/popt \
- @INCPATH@
+ @INCPATH@ \
+ -I$(top_srcdir)/misc
mylibs= $(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
- $(top_builddir)/popt/libpopt.la
+ $(top_builddir)/popt/libpopt.la \
+ @LIBMISC@
LDFLAGS = @LDFLAGS_STATIC@
@@ -42,9 +44,9 @@ noinst_HEADERS = \
acconfig.h build.h system.h
rpm_SOURCES = build.c rpm.c
-rpm_LDADD = $(mylibs) @LIBMISC@
+rpm_LDADD = $(mylibs)
-$(PROGRAMS): $(mylibs) @LIBMISC@
+$(PROGRAMS): $(mylibs)
.PHONY: lclint
lclint:
@@ -57,7 +59,7 @@ rpm2cpio_LDADD = $(mylibs)
rpmconvert_SOURCES = convertdb.c oldrpmdb.c
## Libmisc.a is required for rpmconvert.
-rpmconvert_LDADD = $(mylibs) @LIBMISC@ -lgdbm
+rpmconvert_LDADD = $(mylibs) -lgdbm
install-data-local:
@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm