c93406f23e
have fixed when I imported this port: don't build rpm using -static, as we don't intend to use rpm to install a new system (the configuration system of this port is stupid). one thing leading to another: fix the usual libtool bug, fix the usual gettext bug... fed up of GNU.
60 lines
2.2 KiB
Plaintext
60 lines
2.2 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.2 2000/12/06 09:45:02 espie Exp $
|
|
--- Makefile.in.orig Wed Sep 13 22:00:40 2000
|
|
+++ Makefile.in Tue Dec 5 13:22:12 2000
|
|
@@ -167,15 +167,15 @@ SUBDIRS = intl po popt lib build misc to
|
|
INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
|
|
|
|
|
|
-myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
|
|
+myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib -L/usr/local/lib
|
|
|
|
# XXX libtool can/should generate dependent libs.
|
|
# XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
|
|
-myldadd = $(top_builddir)/build/.libs/librpmbuild.a $(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a @INTLLIBS@ @LIBMISC@
|
|
+myldadd = $(top_builddir)/build/.libs/librpmbuild.a @INTLLIBS@ @LIBMISC@
|
|
|
|
|
|
-LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
|
|
-LDADD = $(myldadd)
|
|
+LDFLAGS = $(myldflags)
|
|
+LDADD = $(myldadd) -L$(top_builddir)/lib/.libs -lrpm -lpopt
|
|
|
|
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
|
|
rpmbin_PROGRAMS = rpm
|
|
@@ -235,7 +235,7 @@ rpmrc.in
|
|
|
|
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|
|
|
-TAR = gtar
|
|
+TAR = tar
|
|
GZIP_ENV = --best
|
|
SOURCES = $(rpm2cpio_SOURCES) $(rpm_SOURCES)
|
|
OBJECTS = $(rpm2cpio_OBJECTS) $(rpm_OBJECTS)
|
|
@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
|
|
@for file in $(DISTFILES); do \
|
|
d=$(srcdir); \
|
|
if test -d $$d/$$file; then \
|
|
- cp -pr $$d/$$file $(distdir)/$$file; \
|
|
+ cp -pr $$/$$file $(distdir)/$$file; \
|
|
else \
|
|
test -f $(distdir)/$$file \
|
|
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
|
@@ -597,17 +597,6 @@ distdir: $(DISTFILES)
|
|
|| exit 1; \
|
|
fi; \
|
|
done
|
|
-build.o: build.c system.h config.h build/rpmbuild.h lib/rpmlib.h \
|
|
- lib/rpmio.h lib/dbindex.h lib/header.h popt/popt.h \
|
|
- lib/stringbuf.h lib/misc.h build/rpmspec.h lib/rpmmacro.h \
|
|
- lib/rpmurl.h build.h lib/install.h
|
|
-rpm.o: rpm.c system.h config.h build/rpmbuild.h lib/rpmlib.h lib/rpmio.h \
|
|
- lib/dbindex.h lib/header.h popt/popt.h lib/stringbuf.h \
|
|
- lib/misc.h build/rpmspec.h lib/rpmmacro.h lib/rpmurl.h build.h \
|
|
- lib/install.h lib/signature.h
|
|
-rpm2cpio.o: rpm2cpio.c system.h config.h lib/rpmlib.h lib/rpmio.h \
|
|
- lib/dbindex.h lib/header.h popt/popt.h
|
|
-
|
|
info-am:
|
|
info: info-recursive
|
|
dvi-am:
|