Fix erroneous uses of ${prefix} rather than $(CDE_INSTALLATION_TOP)

Some Makefiles use prefix when they should be using
CDE_INSTALLATION_TOP.

Patch by Peter G.
This commit is contained in:
Jon Trulson
2020-03-23 13:10:07 -06:00
parent a6e78364d0
commit 5852c4742f
10 changed files with 13 additions and 13 deletions

View File

@@ -9,7 +9,7 @@ dist_cfg_DATA = CDE.lcx
lib_LTLIBRARIES = libDtHelp.la
libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
-DCDE_INSTALLATION_TOP='"${prefix}"' \
-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@

View File

@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LTLIBRARIES = libil.la
libil_la_CFLAGS = -I.. -DDTLIB -DCDE_INSTALLATION_TOP='"${prefix}"' \
libil_la_CFLAGS = -I.. -DDTLIB -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@

View File

@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libraima.la
libraima_la_LIBADD = -lc -lm
libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"${prefix}\" \
libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
@DT_INCDIR@ \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE

View File

@@ -6,7 +6,7 @@ libDtSvc_la_LDFLAGS = -version-info 2:1:0
# USe CPPFLAGS so it will apply to both C and C++ components
libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \
@DT_INCDIR@ -DCDE_INSTALLATION_TOP=\"${prefix}\" \
@DT_INCDIR@ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
if SOLARIS

View File

@@ -1,4 +1,4 @@
unixdir = ${prefix}/app-defaults/C
unixdir = $(CDE_INSTALLATION_TOP)/app-defaults/C
MAINTAINERCLEANFILES = Makefile.in