RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: file Date: 27-Jul-2007 17:39:35
Branch: rpm-4_5 Handle: 2007072716393500
Modified files: (Branch: rpm-4_5)
file/magic Makefile.am
file/src Makefile.am
Log:
install magic in /usr/lib/rpm/@VERSION@.
Summary:
Revision Changes Path
1.17.2.1 +1 -1 file/magic/Makefile.am
1.24.2.1 +3 -3 file/src/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/magic/Makefile.am
============================================================================
$ cvs diff -u -r1.17 -r1.17.2.1 Makefile.am
--- file/magic/Makefile.am 25 May 2007 17:36:00 -0000 1.17
+++ file/magic/Makefile.am 27 Jul 2007 15:39:35 -0000 1.17.2.1
@@ -1,5 +1,5 @@
#pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
-pkglibdir = @prefix@/lib/rpm
+pkglibdir = @prefix@/lib/rpm/4.5
pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
@@ .
patch -p0 <<'@@ .'
Index: file/src/Makefile.am
============================================================================
$ cvs diff -u -r1.24 -r1.24.2.1 Makefile.am
--- file/src/Makefile.am 25 May 2007 17:36:01 -0000 1.24
+++ file/src/Makefile.am 27 Jul 2007 15:39:35 -0000 1.24.2.1
@@ -4,9 +4,9 @@
EXTRA_DIST = test.c
# XXX Make sure compress.c links internal zlib
-INCLUDES = -I../.. -I../../zlib
+INCLUDES = -I../.. # -I../../zlib
-pkglibdir = @prefix@/lib/rpm
+pkglibdir = @prefix@/lib/rpm/4.5
MAGIC = $(pkglibdir)/magic
AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' -DHAVE_LIBZ=1
@@ -25,7 +25,7 @@
noinst_PROGRAMS = file
file_SOURCES = file.c
-file_LDFLAGS = -L../../zlib # -all-static
+file_LDFLAGS = # -L../../zlib # -all-static
file_LDADD = libmagic.la
listobjs:
@@ .
Received on Fri Jul 27 17:39:36 2007