Many changes to Makefiles/autogen and the like to make it build on SUSE systems. Index: Makefile.am ================================================================================ --- Makefile.am +++ Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader po/*.in po/*.po po/rpm.pot \ rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c -SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc . +SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt @WITH_NEON_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc . INCLUDES = \ -I$(top_srcdir)/build \ --- autogen.sh +++ autogen.sh @@ -26,12 +26,12 @@ case $libtoolize in esac esac -[ "`$libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1 -[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 -[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" # && exit 1 +#[ "`$libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1 +#[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 +#[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" # && exit 1 myopts= -if [ X"$@" = X -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then +if [ X"$*" = X -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then export myopts="--prefix=/usr --disable-nls" export CPPFLAGS="-I${myprefix}/include" fi @@ -43,7 +43,8 @@ if [ -d zlib ]; then (echo "--- zlib"; cd zlib; ./autogen.sh --noconfigure "$@") fi if [ -d beecrypt ]; then - (echo "--- beecrypt"; cd beecrypt; ./autogen.sh --noconfigure "$@") + #(echo "--- beecrypt"; cd beecrypt; ./autogen.sh --noconfigure "$@") + (echo "--- beecrypt"; cd beecrypt; ./autogen.sh --without-cplusplus --without-java --without-python "$@") fi if [ -d elfutils ]; then (echo "--- elfutils"; cd elfutils; ./autogen.sh --noconfigure "$@") @@ -54,6 +55,7 @@ fi if [ -d neon ]; then (echo "--- neon"; cd neon; ./autogen.sh "$@") fi +(echo "--- db"; cd db/dist; libtoolize --copy --force ; rm aclocal/libtool.ac ; ./s_config ) echo "--- rpm" $libtoolize --copy --force @@ -66,7 +68,7 @@ if [ "$1" = "--noconfigure" ]; then exit 0; fi -if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then +if [ X"$*" = X -a "X`uname -s`" = "XLinux" ]; then if [ -d /usr/share/man ]; then mandir=/usr/share/man infodir=/usr/share/info --- build/Makefile.am +++ build/Makefile.am @@ -22,7 +22,7 @@ pkgincdir = $(pkgincludedir) pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h noinst_HEADERS = buildio.h -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +LDFLAGS = usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmbuild.la --- configure.ac +++ configure.ac @@ -1,30 +1,3 @@ - -echo " -**************************************************************************** -* * -* *** WARNING WARNING WARNING *** * -* * -* This is source code from the development branch of rpm-4.4.2. * -* * -* If you want the "production" rpm-4.3.3 code, then you should use a * -* rpm-4.3.3 src.rpm. Alternatively, if using a CVS checkout, do * -* the following: * -* * -* cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel login * -* (no password, just carriage return) * -* cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel get rpm * -* cd rpm * -* * -* Here's the rpm-4_3 branch, latest is rpm-4.3.3: * -* cvs up -r rpm-4_3 * -* * -* Here's the rpm-4_2 branch, latest is rpm-4.2.3: * -* cvs up -r rpm-4_2 * -* * -**************************************************************************** -" -sleep 10 - AC_PREREQ(2.59) AC_INIT(rpm, 4.4.2, rpm-devel@lists.dulug.duke.edu) AC_CANONICAL_TARGET @@ -34,10 +7,9 @@ AM_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([foreign]) dnl Set of available languages. -ALL_LINGUAS="cs da de fi fr gl is ja ko no pl pt pt_BR ro ru sk sl sr sv tr" +ALL_LINGUAS="cs da de fi fr gl is ja ko nb pl pt pt_BR ro ru sk sl sr sv tr" dnl Checks for programs. -AC_PROG_CXX AC_PROG_AWK AC_PROG_CC AC_PROG_CPP @@ -310,7 +282,7 @@ WITH_ZLIB_INCLUDE= WITH_ZLIB_LIB= if test -d zlib ; then WITH_ZLIB_SUBDIR=zlib - addlib \${top_builddir}/zlib + # addlib \${top_builddir}/zlib WITH_ZLIB_INCLUDE="-I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" INCPATH="$INCPATH -I\${top_srcdir}/${WITH_ZLIB_SUBDIR}" WITH_ZLIB_LIB="\${top_builddir}/${WITH_ZLIB_SUBDIR}/libz.la" @@ -350,9 +322,9 @@ AC_SUBST(WITH_BZIP2) localdone= dirs=$prefix -if test "$cross_compiling" != "yes"; then - dirs="$dirs /usr/local" -fi +#if test "$cross_compiling" != "yes"; then +# dirs="$dirs /usr/local" +#fi for dir in $dirs do case $dir in @@ -463,7 +435,7 @@ AC_CHECK_HEADER([gelf.h], [ AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) WITH_ELFUTILS_SUBDIR=elfutils WITH_LIBELF_INCLUDE="-I\${top_srcdir}/${WITH_ELFUTILS_SUBDIR}/libelf" - WITH_LIBELF_LIB="\${top_builddir}/${WITH_ELFUTILS_SUBDIR}/libelf/libelf.a" + WITH_LIBELF_LIB="\${top_builddir}/${WITH_ELFUTILS_SUBDIR}/libelf/libelf_pic.a" fi ]) AC_SUBST(WITH_ELFUTILS_SUBDIR) @@ -504,7 +476,8 @@ AC_CHECK_HEADER([beecrypt/beecrypt.h], [ AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the 'beecrypt' library (-lbeecrypt).]) WITH_BEECRYPT_SUBDIR=beecrypt WITH_BEECRYPT_INCLUDE="-I\${top_srcdir}/${WITH_BEECRYPT_SUBDIR}" - WITH_BEECRYPT_LIB="\${top_builddir}/${WITH_BEECRYPT_SUBDIR}/libbeecrypt.la" + dnl WITH_BEECRYPT_LIB="\${top_builddir}/${WITH_BEECRYPT_SUBDIR}/libbeecrypt.la" + AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the header file.]) fi ]) AC_SUBST(WITH_BEECRYPT_SUBDIR) @@ -648,6 +621,9 @@ dnl AmigaOS and IXEmul have a fork() dum esac AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION(0.11.2) +MKINSTALLDIRS="\$(top_builddir)/./mkinstalldirs" +AC_SUBST(MKINSTALLDIRS) dnl TVM: dnl horrible *temporary* hack to make sure that if we found gettext() in dnl -lintl that we add -lintl *back* to $LIBS. @@ -943,54 +919,74 @@ withval=auto AC_ARG_WITH(python, [ --with-python build rpm python bindings ]) WITH_PYTHON_VERSION=$withval -if test $withval = auto ; then +if test "$WITH_PYTHON_VERSION" = auto ; then +AC_MSG_CHECKING(for python 2.5) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +main() { + exit(strncmp("2.5", PY_VERSION, 3)); +} ]])],[withval=yes],[withval=no],[withval=yes]) +AC_MSG_RESULT($withval) +if test $withval = yes ; then + WITH_PYTHON_VERSION="2.5" +fi +fi + +if test "$WITH_PYTHON_VERSION" = auto ; then AC_MSG_CHECKING(for python 2.4) AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include main() { exit(strncmp("2.4", PY_VERSION, 3)); } ]])],[withval=yes],[withval=no],[withval=yes]) - AC_MSG_RESULT($withval) - if test $withval = yes ; then - WITH_PYTHON_VERSION="2.4" - else - - AC_MSG_CHECKING(for python 2.3) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - main() { - exit(strncmp("2.3", PY_VERSION, 3)); - } ]])],[withval=yes],[withval=no],[withval=yes]) - AC_MSG_RESULT($withval) - if test $withval = yes ; then - WITH_PYTHON_VERSION="2.3" - else - - AC_MSG_CHECKING(for python 2.2) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - main() { - exit(strncmp("2.2", PY_VERSION, 3)); - } ]])],[withval=yes],[withval=no],[withval=yes]) - AC_MSG_RESULT($withval) - if test $withval = yes ; then - WITH_PYTHON_VERSION="2.2" - else - - AC_MSG_CHECKING(for python 1.5.2) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - main() { - exit(strcmp("1.5.2", PY_VERSION)); - } ]])],[withval=yes],[withval=no],[withval=yes]) - AC_MSG_RESULT($withval) - if test $withval = yes ; then - WITH_PYTHON_VERSION="1.5" - fi - fi - fi - fi +AC_MSG_RESULT($withval) +if test $withval = yes ; then + WITH_PYTHON_VERSION="2.4" +fi +fi + +if test "$WITH_PYTHON_VERSION" = auto ; then +AC_MSG_CHECKING(for python 2.3) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +main() { + exit(strncmp("2.3", PY_VERSION, 3)); +} ]])],[withval=yes],[withval=no],[withval=yes]) +AC_MSG_RESULT($withval) +if test $withval = yes ; then + WITH_PYTHON_VERSION="2.3" +fi +fi + +if test "$WITH_PYTHON_VERSION" = auto ; then +AC_MSG_CHECKING(for python 2.2) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +main() { + exit(strncmp("2.2", PY_VERSION, 3)); +} ]])],[withval=yes],[withval=no],[withval=yes]) +AC_MSG_RESULT($withval) +if test $withval = yes ; then + WITH_PYTHON_VERSION="2.2" +fi +fi + +if test "$WITH_PYTHON_VERSION" = auto ; then +AC_MSG_CHECKING(for python 1.5.2) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +main() { + exit(strcmp("1.5.2", PY_VERSION)); +} ]])],[withval=yes],[withval=no],[withval=yes]) +AC_MSG_RESULT($withval) +if test $withval = yes ; then + WITH_PYTHON_VERSION="1.5" +fi +fi + +if test "$WITH_PYTHON_VERSION" = auto ; then + WITH_PYTHON_VERSION=no fi if test "$WITH_PYTHON_VERSION" != no ; then @@ -1283,6 +1279,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH="${ mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;; mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;; m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;; +parisc*|hppa*) RPMCANONCOLOR=0; RPMCANONARCH=hppa ;; *) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;; esac case "${build_os_noversion}" in @@ -1290,7 +1287,8 @@ mint) RPMCANONARCH=m68kmint ;; esac RPMCANONVENDOR="$build_vendor" case "${build_vendor}" in -unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos) +unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse) + RPMCANONVENDOR=suse test -f /etc/redhat-release && RPMCANONVENDOR=redhat test -f /etc/pld-release && RPMCANONVENDOR=pld test -f /etc/mandrake-release && RPMCANONVENDOR=mandrake @@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) +AC_CONFIG_SUBDIRS(popt zlib file sqlite db3 elfutils) AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile --- db3/configure +++ db3/configure @@ -10,9 +10,9 @@ rm -f config.cache # XXX edit CFLAGS= ... out of invocation args ??? ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`" -CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ - --enable-shared --enable-static --enable-rpc \ - --with-uniquename=_rpmdb --srcdir=$db_dist +CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \ + --enable-shared --enable-static \ + --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS mv Makefile Makefile.orig cat Makefile.orig | sed -e '/^install[:-]/c\ --- file/src/Makefile.am +++ file/src/Makefile.am @@ -26,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0: noinst_PROGRAMS = file file_SOURCES = file.c -file_LDFLAGS = -L../../zlib # -all-static +file_LDFLAGS = # -L../../zlib # -all-static file_LDADD = libmagic.la listobjs: --- installplatform +++ installplatform @@ -62,11 +62,11 @@ for SUBST in $SUBSTS ; do sparcv9-linux) MULTILIBNO=1 ;; sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; s390-linux) MULTILIBNO=1 ;; - s390x-linux) LIB=lib64; MULTILIBNO=2 ;; + s390x-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; ppc-linux) MULTILIBNO=1 ;; - ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; + ppc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; i?86-linux|pentium?-linux|athlon-linux) MULTILIBNO=1 ;; - x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;; + x86_64-linux|amd64-linux|ia32e-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux; LIB=lib64; MULTILIBNO=2 ;; esac if [ -n "$MULTILIBNO" ]; then @@ -96,6 +96,9 @@ for SUBST in $SUBSTS ; do apple) VENDORSED='-e s,^@apple@,,' ;; + suse) + VENDORSED='-e s,^@SuSE@,,' + ;; esac cat $PLATFORM \ --- lib/Makefile.am +++ lib/Makefile.am @@ -29,7 +29,7 @@ noinst_HEADERS = \ mylibs = librpm.la LIBS = -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +LDFLAGS = usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpm.la --- po/Makefile.in +++ po/Makefile.in @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) CC = gcc GMSGFMT = /usr/bin/msgfmt --- po/Makefile.in.in +++ po/Makefile.in.in @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) CC = @CC@ GMSGFMT = @GMSGFMT@ --- popt/autogen.sh +++ popt/autogen.sh @@ -28,7 +28,7 @@ fi cd "$THEDIR" -if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then +if [ X"$*" = X -a "X`uname -s`" = "XLinux" ]; then $srcdir/configure --prefix=/usr "$@" else $srcdir/configure "$@" --- popt/configure.ac +++ popt/configure.ac @@ -1,11 +1,12 @@ AC_INIT(popt.h) AC_CANONICAL_SYSTEM AC_PREREQ(2.12) -AC_CONFIG_HEADERS AM_INIT_AUTOMAKE(popt, 1.10.2) AM_CONFIG_HEADER(config.h) -ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW" +ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko nb pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW" +MKINSTALLDIRS="\$(top_builddir)/./mkinstalldirs" +AC_SUBST(MKINSTALLDIRS) AC_ISC_POSIX --- popt/po/Makefile.in +++ popt/po/Makefile.in @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 MKINSTALLDIRS = $(top_builddir)/./../mkinstalldirs -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) CC = gcc GMSGFMT = /usr/bin/msgfmt --- popt/po/Makefile.in.in +++ popt/po/Makefile.in.in @@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac` +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) CC = @CC@ GMSGFMT = @GMSGFMT@ --- rpmdb/Makefile.am +++ rpmdb/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = fprint.h header_interna pkgbindir = @RPMCONFIGDIR@ pkgbin_PROGRAMS = \ rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \ - rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \ + rpmdb_printlog rpmdb_recover rpmdb_stat rpmdb_upgrade \ rpmdb_verify mylibs = librpmdb.la @@ -42,7 +42,7 @@ LIBS = libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +LDFLAGS = usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmdb.la --- rpmio/Makefile.am +++ rpmio/Makefile.am @@ -24,9 +24,9 @@ pkginc_HEADERS = \ rpmsq.h rpmsw.h ugid.h noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h -BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) +BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/listobjs) -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +LDFLAGS = usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmio.la @@ -41,14 +41,14 @@ librpmio_la_LDFLAGS = -release 4.4 $(LDF @WITH_MAGIC_LIB@ \ @WITH_ZLIB_LIB@ \ -lpthread -librpmio_la_LIBADD = # $(BEECRYPTLOBJS) -librpmio_la_DEPENDENCIES = # .created +librpmio_la_LIBADD = $(BEECRYPTLOBJS) +librpmio_la_DEPENDENCIES = .created .created: if test X"@WITH_BEECRYPT_SUBDIR@" != X; then \ ${MAKE} -C $(top_builddir)/@WITH_BEECRYPT_SUBDIR@ listobjs ; \ for lo in $(BEECRYPTLOBJS); do \ - [ -f $$lo ] || $(LN_S) $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/$$lo $$lo ; \ + [ -f $$lo ] || sed -e "s!'!'$(top_builddir)/beecrypt/!" < $(top_builddir)/beecrypt/$$lo > $$lo ; \ done \ fi touch $@ --- scripts/Makefile.am +++ scripts/Makefile.am @@ -6,6 +6,7 @@ EXTRA_DIST = \ brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ brp-strip brp-strip-comment-note \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-lib64-linux brp-symlink \ check-files check-prereqs convertrpmrc.sh cross-build \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ cpanflute cpanflute2 Specfile.pm find-provides.perl \ @@ -17,7 +18,8 @@ EXTRA_DIST = \ sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh \ macros.perl* macros.python* \ - macros.php* find-*.php find-php-* + macros.php* find-*.php find-php-* \ + find-provides.ksyms find-requires.ksyms installprefix = $(DESTDIR) @@ -28,6 +30,7 @@ config_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile brp-redhat \ brp-strip brp-strip-comment-note \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-lib64-linux brp-symlink \ check-files check-prereqs convertrpmrc.sh cross-build \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ cpanflute cpanflute2 Specfile.pm find-provides.perl \ @@ -36,4 +39,5 @@ config_SCRIPTS = \ rpmdb_loadcvt rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ - vpkg-provides.sh vpkg-provides2.sh + vpkg-provides.sh vpkg-provides2.sh \ + find-provides.ksyms find-requires.ksyms