pkubat / rpms / gdbm

Forked from rpms/gdbm 6 years ago
Clone
a58c436
2009-02-27  Stepan Kasal  <skasal@redhat.com>
a58c436
a58c436
	* Makefile.in: respect the *dir variables as set by configure;
a58c436
	clean up.
a58c436
a58c436
--- gdbm-1.8.0/Makefile.in.fhs	1999-05-19 05:16:06.000000000 +0200
a58c436
+++ gdbm-1.8.0/Makefile.in	2009-02-27 18:52:19.000000000 +0100
a58c436
@@ -1,7 +1,7 @@
a58c436
 #### Start of system configuration section. ####
a58c436
 
a58c436
 srcdir = @srcdir@
a58c436
-top_builddir = @srcdir@
a58c436
+top_builddir = @top_builddir@
a58c436
 VPATH = @srcdir@
a58c436
 
a58c436
 CC = @CC@
a58c436
@@ -14,36 +14,29 @@
cvsdist 26a6efe
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
cvsdist 26a6efe
 INSTALL_DATA = @INSTALL_DATA@
cvsdist 26a6efe
 
cvsdist 26a6efe
-# File ownership and group
cvsdist 26a6efe
-BINOWN = bin
cvsdist 26a6efe
-BINGRP = bin
cvsdist 26a6efe
-
cvsdist 26a6efe
 MAKEINFO = makeinfo
cvsdist 26a6efe
 TEXI2DVI = texi2dvi
cvsdist 26a6efe
 
a58c436
-DEFS =
a58c436
+DEFS = @DEFS@
a58c436
 
a58c436
 # Where the system [n]dbm routines are...
a58c436
-LIBS = @LIBS@ -lc
a58c436
+LIBS = @LIBS@
a58c436
 
a58c436
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
a58c436
-CFLAGS = -O
a58c436
-LDFLAGS =
a58c436
+CPPFLAGS = @CPPFLAGS@
a58c436
+CFLAGS = @CFLAGS@
a58c436
+LDFLAGS = @LDFLAGS@
a58c436
 
cvsdist 26a6efe
 # Common prefix for installation directories
a58c436
-prefix = /usr/local
a58c436
-exec_prefix = $(prefix)
cvsdist 26a6efe
-binprefix = $(exec_prefix)
cvsdist 26a6efe
-manprefix = $(prefix)
a58c436
-
a58c436
-# Directory in which to put libgdbm.a.
a58c436
-libdir = $(exec_prefix)/lib
a58c436
-# The include directory for gdbm.h and dbm.h.
a58c436
-includedir = $(prefix)/include
a58c436
-# Info and man directories.
a58c436
-infodir = $(prefix)/info
cvsdist 26a6efe
-man3dir = $(prefix)/man/man3
a58c436
-manext = 3
a58c436
+prefix = @prefix@
a58c436
+exec_prefix = @exec_prefix@
a58c436
+datarootdir = @datarootdir@
a58c436
+mandir = @mandir@
a58c436
+libdir = @libdir@
a58c436
+includedir = @includedir@
a58c436
+pkgincludedir = $(includedir)/gdbm
a58c436
+infodir = @infodir@
cvsdist 26a6efe
+man3dir = $(mandir)/man3
cvsdist 26a6efe
 
cvsdist 26a6efe
 #### End of system configuration section. ####
a58c436
 
a58c436
@@ -120,20 +113,16 @@
a58c436
 progs: $(PROGS)
a58c436
 
cvsdist 26a6efe
 install: libgdbm.la gdbm.h gdbm.info
a58c436
-	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
a58c436
-	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
cvsdist 26a6efe
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
cvsdist 26a6efe
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
cvsdist 26a6efe
-		$(man3dir)/gdbm.3
cvsdist 26a6efe
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
cvsdist 26a6efe
-		$(infodir)/gdbm.info
a58c436
+	$(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir)
a58c436
+	$(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la
a58c436
+	$(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h
cvsdist 26a6efe
+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
cvsdist 26a6efe
+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
cvsdist 26a6efe
 
cvsdist 26a6efe
 install-compat:
a58c436
-	$(srcdir)/mkinstalldirs $(includedir)
cvsdist 26a6efe
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
cvsdist 26a6efe
-		$(includedir)/dbm.h
cvsdist 26a6efe
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
cvsdist 26a6efe
-		$(includedir)/ndbm.h
a58c436
+	$(srcdir)/mkinstalldirs $(pkgincludedir)
a58c436
+	$(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h
a58c436
+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h
cvsdist 26a6efe
 
cvsdist 26a6efe
 #libgdbm.a: $(OBJS) gdbm.h
cvsdist 26a6efe
 #	rm -f libgdbm.a