Disable build and install of unpackaged files
These are no longer packaged anyway, so no need to bother.
This commit is contained in:
parent
e0e8952034
commit
e8c780c2b0
54
Makefile.am
54
Makefile.am
@ -26,14 +26,14 @@ myLDADD = $(mylibLDADD) $(top_builddir)/build/librpmbuild.la
|
||||
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
|
||||
rpmbin_PROGRAMS =
|
||||
|
||||
bin_PROGRAMS = rpm rpm2cpio
|
||||
#bin_PROGRAMS = rpm rpm2cpio
|
||||
bin_SCRIPTS = gendiff
|
||||
|
||||
pkgdatadir = @RPMCONFIGDIR@
|
||||
pkglibdir = @RPMCONFIGDIR@
|
||||
pkglibexecdir = @RPMCONFIGDIR@
|
||||
pkgdata_DATA = rpmrc rpmpopt-$(VERSION) macros
|
||||
pkglibexec_PROGRAMS = rpmb rpmd rpmi rpmk rpmq
|
||||
pkglibexec_PROGRAMS = rpmb # rpmd rpmi rpmk rpmq
|
||||
pkglibexec_SCRIPTS = find-provides find-requires
|
||||
|
||||
rpmpopt-$(VERSION): rpmpopt
|
||||
@ -106,34 +106,34 @@ CVSTAG = r$(subst .,-,$(VERSION))
|
||||
pkgsrcdir = $(prefix)/src/RPM
|
||||
|
||||
install-data-local:
|
||||
@$(mkinstalldirs) $(DESTDIR)$(rpmbindir)
|
||||
@@LN_S@ ..$(bindir)/rpm $(DESTDIR)$(rpmbindir)/
|
||||
@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpmrc
|
||||
@@LN_S@ rpm/rpmrc $(DESTDIR)$(prefix)/lib/rpmrc
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpmpopt
|
||||
@@LN_S@ rpm/rpmpopt-$(VERSION) $(DESTDIR)$(prefix)/lib/rpmpopt
|
||||
@: $(mkinstalldirs) $(DESTDIR)$(rpmbindir)
|
||||
@: @LN_S@ ..$(bindir)/rpm $(DESTDIR)$(rpmbindir)/
|
||||
@: $(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
|
||||
@: rm -f $(DESTDIR)$(prefix)/lib/rpmrc
|
||||
@: @LN_S@ rpm/rpmrc $(DESTDIR)$(prefix)/lib/rpmrc
|
||||
@: rm -f $(DESTDIR)$(prefix)/lib/rpmpopt
|
||||
@: @LN_S@ rpm/rpmpopt-$(VERSION) $(DESTDIR)$(prefix)/lib/rpmpopt
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpm/rpmt
|
||||
@@LN_S@ rpmb $(DESTDIR)$(prefix)/lib/rpm/rpmt
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpm/rpme
|
||||
@@LN_S@ rpmi $(DESTDIR)$(prefix)/lib/rpm/rpme
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpm/rpmu
|
||||
@@LN_S@ rpmi $(DESTDIR)$(prefix)/lib/rpm/rpmu
|
||||
@rm -f $(DESTDIR)$(prefix)/lib/rpm/rpmv
|
||||
@@LN_S@ rpmq $(DESTDIR)$(prefix)/lib/rpm/rpmv
|
||||
@: rm -f $(DESTDIR)$(prefix)/lib/rpm/rpme
|
||||
@: @LN_S@ rpmi $(DESTDIR)$(prefix)/lib/rpm/rpme
|
||||
@: rm -f $(DESTDIR)$(prefix)/lib/rpm/rpmu
|
||||
@: @LN_S@ rpmi $(DESTDIR)$(prefix)/lib/rpm/rpmu
|
||||
@: rm -f $(DESTDIR)$(prefix)/lib/rpm/rpmv
|
||||
@: @LN_S@ rpmq $(DESTDIR)$(prefix)/lib/rpm/rpmv
|
||||
rm -f $(DESTDIR)$(bindir)/rpmbuild
|
||||
@LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild
|
||||
rm -f $(DESTDIR)$(bindir)/rpmquery
|
||||
@LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
|
||||
rm -f $(DESTDIR)$(bindir)/rpmverify
|
||||
@LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
|
||||
rm -f $(DESTDIR)$(bindir)/rpmsign
|
||||
@LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
|
||||
rm -f $(DESTDIR)$(bindir)/rpmdb
|
||||
@LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb
|
||||
for bf in e i u ; do \
|
||||
rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
|
||||
@LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
|
||||
@: rm -f $(DESTDIR)$(bindir)/rpmquery
|
||||
@: LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery
|
||||
@: rm -f $(DESTDIR)$(bindir)/rpmverify
|
||||
@: LN_S@ ../lib/rpm/rpmv $(DESTDIR)$(bindir)/rpmverify
|
||||
@: rm -f $(DESTDIR)$(bindir)/rpmsign
|
||||
@: LN_S@ ../lib/rpm/rpmk $(DESTDIR)$(bindir)/rpmsign
|
||||
@: rm -f $(DESTDIR)$(bindir)/rpmdb
|
||||
@: LN_S@ ../lib/rpm/rpmd $(DESTDIR)$(bindir)/rpmdb
|
||||
@for bf in e i u ; do \
|
||||
: rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
|
||||
: @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
|
||||
done
|
||||
rm -f $(DESTDIR)$(bindir)/relative
|
||||
@LN_S@ ../lib/rpm/relative $(DESTDIR)$(bindir)/relative
|
||||
@ -169,7 +169,7 @@ install-data-local:
|
||||
solaris*|linux*) \
|
||||
chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \
|
||||
esac
|
||||
@$(mkinstalldirs) $(DESTDIR)/var/tmp
|
||||
@: $(mkinstalldirs) $(DESTDIR)/var/tmp
|
||||
|
||||
.PHONY: setperms
|
||||
setperms:
|
||||
|
@ -11,8 +11,9 @@ AM_CPPFLAGS = -I. \
|
||||
LIBS =
|
||||
|
||||
pkgincdir = $(pkgincludedir)
|
||||
pkginc_HEADERS = rpmbuild.h rpmspec.h
|
||||
noinst_HEADERS = buildio.h checkFiles.h interdep.h
|
||||
noinst_HEADERS = \
|
||||
rpmbuild.h rpmspec.h \
|
||||
buildio.h checkFiles.h interdep.h
|
||||
|
||||
lib_LTLIBRARIES = librpmbuild.la
|
||||
librpmbuild_la_SOURCES = \
|
||||
|
@ -1,7 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
SUBDIRS = manual ja pl ru sk
|
||||
SUBDIRS = manual # ja pl ru sk
|
||||
|
||||
man_MANS = gendiff.1 rpm.8 rpmbuild.8 rpm2cpio.8
|
||||
man_MANS = gendiff.1 rpmbuild.8 # rpm.8 rpm2cpio.8
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
@ -9,9 +9,8 @@ AM_CPPFLAGS = -I. \
|
||||
@INCPATH@
|
||||
|
||||
pkgincdir = $(pkgincludedir)
|
||||
pkginc_HEADERS = \
|
||||
header.h misc.h rpmcli.h rpmlib.h stringbuf.h
|
||||
noinst_HEADERS = \
|
||||
header.h misc.h rpmcli.h rpmlib.h stringbuf.h \
|
||||
al.h cpio.h depends.h fsm.h header_internal.h \
|
||||
manifest.h psm.h \
|
||||
rpmlead.h set.h signature.h
|
||||
|
@ -1,2 +0,0 @@
|
||||
ru
|
||||
uk
|
13
rpm-4_0.spec
13
rpm-4_0.spec
@ -248,6 +248,8 @@ lib/test-set
|
||||
%make_install DESTDIR='%buildroot' install
|
||||
chmod a-w %buildroot%_usrsrc/RPM{,/RPMS/*}
|
||||
|
||||
rm %buildroot%_libdir/librpm{,build,db,io}.so
|
||||
%if 0
|
||||
# Save list of packages through cron.
|
||||
#mkdir -p %buildroot%_sysconfdir/cron.daily
|
||||
#install -p -m750 scripts/%oname.daily %buildroot%_sysconfdir/cron.daily/%oname
|
||||
@ -280,10 +282,10 @@ install -p -m644 CHANGES.bz2 CREDITS README README.ALT* \
|
||||
%buildroot%_docdir/%oname-%rpm_version/
|
||||
cp -a doc/manual %buildroot%_docdir/%oname-%rpm_version/
|
||||
rm -f %buildroot%_docdir/%oname-%rpm_version/manual/{Makefile*,buildroot}
|
||||
%if_with apidocs
|
||||
#if_with apidocs
|
||||
cp -a apidocs/man/man3 %buildroot%_mandir/
|
||||
cp -a apidocs/html %buildroot%_docdir/%oname-%rpm_version/apidocs/
|
||||
%endif #with apidocs
|
||||
#endif #with apidocs
|
||||
|
||||
# rpminit(1).
|
||||
install -pD -m755 rpminit %buildroot%_bindir/rpminit
|
||||
@ -291,6 +293,7 @@ install -pD -m644 rpminit.1 %buildroot%_man1dir/rpminit.1
|
||||
|
||||
# Valid groups.
|
||||
install -p -m644 GROUPS %buildroot%_rpmlibdir/
|
||||
%endif
|
||||
|
||||
# buildreq ignore rules.
|
||||
install -pD -m644 rpm-build.buildreq %buildroot%_sysconfdir/buildreqs/files/ignore.d/rpm-build
|
||||
@ -311,15 +314,17 @@ popd
|
||||
grep -Fv /brp- |
|
||||
sed -e "s|^%buildroot|%%attr(-,root,%oname) |g" >>rpmbuild.platform
|
||||
|
||||
%ifdef add_findreq_skiplist
|
||||
%if 0
|
||||
#ifdef add_findreq_skiplist
|
||||
# These shell libraries hopefully do not require anything special,
|
||||
# but we want to keep the "rpm" package dependencies to bare minimum.
|
||||
%add_findreq_skiplist %_rpmlibdir/functions
|
||||
%add_findreq_skiplist %_rpmlibdir/find-package
|
||||
%endif
|
||||
#endif
|
||||
# However, syntax check is still a good idea.
|
||||
sh -n %buildroot%_rpmlibdir/functions
|
||||
sh -n %buildroot%_rpmlibdir/find-package
|
||||
%endif
|
||||
|
||||
%if "%_lib" == "lib"
|
||||
if [ -s /lib/libc.so.6 -a -s /lib/libz.so.1 -a -n "$(getconf LFS_CFLAGS)" ]; then
|
||||
|
@ -13,8 +13,9 @@ LIBELF = @WITH_LIBELF_LIB@
|
||||
LIBPOPT = @LIBPOPT@
|
||||
|
||||
pkgincdir = $(pkgincludedir)
|
||||
pkginc_HEADERS = hdrinline.h rpmdb.h
|
||||
noinst_HEADERS = fprint.h rpmhash.h jhash.h
|
||||
noinst_HEADERS = \
|
||||
hdrinline.h rpmdb.h \
|
||||
fprint.h rpmhash.h jhash.h
|
||||
|
||||
mylibpaths = -L$(top_builddir)/lib/.libs
|
||||
mylibs = -lrpm
|
||||
|
@ -9,10 +9,9 @@ EXTRA_PROGRAMS = tdigest tkey tring trpmio
|
||||
AM_CPPFLAGS = -I. @INCPATH@
|
||||
|
||||
pkgincdir = $(pkgincludedir)
|
||||
pkginc_HEADERS = \
|
||||
rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h \
|
||||
ugid.h
|
||||
noinst_HEADERS = bsearch.h rpmio_internal.h rpmpgp.h
|
||||
noinst_HEADERS = \
|
||||
rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h ugid.h \
|
||||
bsearch.h rpmio_internal.h rpmpgp.h
|
||||
|
||||
lib_LTLIBRARIES = librpmio.la
|
||||
librpmio_la_SOURCES = digest.c macro.c rpmio.c rpmlog.c rpmmalloc.c \
|
||||
|
@ -37,11 +37,9 @@ installprefix = $(DESTDIR)
|
||||
all:
|
||||
|
||||
configdir = ${prefix}/lib/rpm
|
||||
config_DATA = .provides.sh 0common-files.req.list
|
||||
config_DATA = 0common-files.req.list # .provides.sh
|
||||
config_SCRIPTS = \
|
||||
posttrans-filetriggers 0ldconfig.filetrigger \
|
||||
debuginfo.req debuginfo.req.files debuginfo.prov debuginfo.prov.files \
|
||||
functions find-package \
|
||||
find-debuginfo-files \
|
||||
find-scriptlet-requires \
|
||||
brp-alt \
|
||||
@ -63,7 +61,8 @@ config_SCRIPTS = \
|
||||
static.req static.req.files \
|
||||
symlinks.req symlinks.req.files \
|
||||
tmpdir.sh \
|
||||
verify-elf
|
||||
verify-elf \
|
||||
# 0ldconfig.filetrigger find-package functions posttrans-filetriggers
|
||||
|
||||
install-data-local:
|
||||
$(mkinstalldirs) $(DESTDIR)$(configdir)/brp.d
|
||||
|
@ -28,8 +28,8 @@ noinst_PROGRAMS = \
|
||||
dump dumpdb rpmarchive rpmheader rpmlead rpmsignature setcmp.static
|
||||
|
||||
pkgbindir = @RPMCONFIGDIR@
|
||||
pkgbin_PROGRAMS = javadeps filesize dump_ld_config relative pdeath_execute mkset setcmp debugedit
|
||||
bin_PROGRAMS = rpmvercmp rpmevrcmp
|
||||
pkgbin_PROGRAMS = filesize dump_ld_config relative mkset setcmp debugedit # javadeps pdeath_execute
|
||||
#bin_PROGRAMS = rpmvercmp rpmevrcmp
|
||||
|
||||
javadeps_SOURCES = javadeps.c
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user