| 1 | --- config/mkcommon.inc.in 2007-03-13 13:32:10.000000000 +0100 |
|---|
| 2 | +++ config/mkcommon.inc.in.new 2007-04-18 21:37:26.000000000 +0200 |
|---|
| 3 | @@ -42,7 +42,7 @@ |
|---|
| 4 | # build related stuff (configure) |
|---|
| 5 | LDFLAGS = @LDFLAGS@ |
|---|
| 6 | CFLAGS = @CFLAGS@ @DEFS@ $(PDFWALL) $(PDFPEDANTIC) $(MYCFLAGS) |
|---|
| 7 | -CPPFLAGS = @CPPFLAGS@ $(INCLUDES) |
|---|
| 8 | +CPPFLAGS = $(INCLUDES) @CPPFLAGS@ |
|---|
| 9 | CXXFLAGS = @CXXFLAGS@ |
|---|
| 10 | PDFWALL = @PDFWALL@ |
|---|
| 11 | PDFPEDANTIC = @PDFPEDANTIC@ |
|---|
| 12 | @@ -65,7 +65,7 @@ |
|---|
| 13 | |
|---|
| 14 | |
|---|
| 15 | # Perl |
|---|
| 16 | -PERLLIBDIR = @PERLLIBDIR@ |
|---|
| 17 | +PERLLIBDIR = ${DESTDIR}@PERLLIBDIR@ |
|---|
| 18 | PERLINCLUDE = @PERLINCLUDE@ |
|---|
| 19 | PERLLINK = @PERLLINK@ |
|---|
| 20 | PERL = @PERL@ |
|---|
| 21 | @@ -79,7 +79,7 @@ |
|---|
| 22 | RUBY = @RUBY@ |
|---|
| 23 | |
|---|
| 24 | TCLINCLUDE = @TCLINCLUDE@ |
|---|
| 25 | -TCLPACKAGEDIR = @TCLPACKAGEDIR@ |
|---|
| 26 | +TCLPACKAGEDIR = ${DESTDIR}@TCLPACKAGEDIR@ |
|---|
| 27 | TCLBIN = @TCLBIN@ |
|---|
| 28 | |
|---|
| 29 | # PDFlib includes |
|---|
| 30 | @@ -145,7 +145,7 @@ |
|---|
| 31 | PDULIBLINK = @PDULIBLINK@ |
|---|
| 32 | |
|---|
| 33 | # installation directories (configure) |
|---|
| 34 | -prefix = @prefix@ |
|---|
| 35 | +prefix = ${DESTDIR}@prefix@ |
|---|
| 36 | exec_prefix = @exec_prefix@ |
|---|
| 37 | libdir = @libdir@ |
|---|
| 38 | includedir = @includedir@ |
|---|
