From: ewt <devnull@localhost>
Date: Sun, 29 Sep 1996 02:26:24 +0000 (+0000)
Subject: moved CPP, prefix, exec_prefix, libdir, LIBRPMRC_FILENAME defs here
X-Git-Tag: rpm-4.4-release~4670
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbc636dce728df79ecabc2a89afa8cedf5deac1b;p=platform%2Fupstream%2Frpm.git

moved CPP, prefix, exec_prefix, libdir, LIBRPMRC_FILENAME defs here
added selectable i18n support

CVS patchset: 1065
CVS date: 1996/09/29 02:26:24
---

diff --git a/Makefile.inc.in b/Makefile.inc.in
index a2ba87d..5fad80a 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -1,13 +1,19 @@
 topdir=@topdir@
+CPP = @CPP@
+prefix= @prefix@
+exec_prefix = @exec_prefix@
+libdir= $(prefix)/lib
 
 AR = ar
 RANLIB = @RANLIB@
 OPTS = @DEFS@
-CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS) -I$(topdir) -I$(topdir)/lib \
-	-I$(topdir)/build -I$(topdir)/misc -I$(topdir)/.. -I$(topdir)/../lib \
-	-I$(topdir)/../build -I$(topdir)/../misc \
+LIBRPMRC_FILENAME=$(libdir)/rpmrc
+INTLDEF = @INTLDEF@
+CFLAGS = @CFLAGS@ @INCPATH@ @INTLDEF@ $(WARNINGS) $(OPTS) \
+	-I$(topdir)/lib -I$(topdir)/misc \
 	-DLIBRPMRC_FILENAME="\"$(LIBRPMRC_FILENAME)"\" -DVERSION=\"$(VERSION)\" 
-LDFLAGS = @LDFLAGS@ -Llib -Lbuild -Lmisc -L../lib -L../build -L../misc
+LDFLAGS = @LDFLAGS@ @LIBPATH@ -Llib -Lbuild -Lmisc -L$(topdir)/lib \
+		-L$(topdir)/build -L$(topdir)/misc
 VERSION = 2.2.7
 CC = @CC@