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.

diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am
index dc76171dd95ccfe4b4191f48061e9d7d0ec944de..787c65554f2c7ec83b33a348b695855d78d32bc8 100644 (file)
--- a/cde/lib/DtHelp/Makefile.am
+++ b/cde/lib/DtHelp/Makefile.am
@@ -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@
 

diff --git a/cde/lib/DtHelp/il/Makefile.am b/cde/lib/DtHelp/il/Makefile.am
index d26e90f45967b0928985aa650292adf96b2417d1..f7aabd67bcd09663f12a737939a0d56bf1b82dc5 100644 (file)
--- a/cde/lib/DtHelp/il/Makefile.am
+++ b/cde/lib/DtHelp/il/Makefile.am
@@ -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@
 

diff --git a/cde/lib/DtSearch/raima/Makefile.am b/cde/lib/DtSearch/raima/Makefile.am
index a317107e51af82c7f76d948c00f090929d2a4765..a05e57518e59398fd1193e4d64a2e65a71fb6c43 100644 (file)
--- a/cde/lib/DtSearch/raima/Makefile.am
+++ b/cde/lib/DtSearch/raima/Makefile.am
@@ -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

diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am
index 65890aa7ad20cd7fd1221137a981ab92f5c58f18..bb9650c23ccde9c87644f780f51f56ca1b80a4b9 100644 (file)
--- a/cde/lib/DtSvc/Makefile.am
+++ b/cde/lib/DtSvc/Makefile.am
@@ -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

diff --git a/cde/lib/DtWidget/Makefile.am b/cde/lib/DtWidget/Makefile.am
index e09f4f5eae539abd9fefcdba9cb63eb8ab8b317e..3fc934ba1cce499a97bcaccc1cf5854a8d15b831 100644 (file)
--- a/cde/lib/DtWidget/Makefile.am
+++ b/cde/lib/DtWidget/Makefile.am
@@ -1,4 +1,4 @@
-unixdir = ${prefix}/app-defaults/C
+unixdir = $(CDE_INSTALLATION_TOP)/app-defaults/C
 
 MAINTAINERCLEANFILES = Makefile.in
 

diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am
index 2cc109071d5a2ea729c23f3a499be53e3a4c5e1c..1c8de8c635375e5c45fb5b2c94a01edfbb135286 100644 (file)
--- a/cde/programs/dtfile/Makefile.am
+++ b/cde/programs/dtfile/Makefile.am
@@ -1,4 +1,4 @@
-configdir = ${prefix}/config/C
+configdir = $(CDE_INSTALLATION_TOP)/config/C
 
 SUBDIRS = dtcopy
 
@@ -12,7 +12,7 @@ dist_config_DATA = dtfile.config
 dist_bin_SCRIPTS = dtfile_error
 
 dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-               -DCDE_INSTALLATION_TOP=\"${prefix}\" \
+               -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
                -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
                -DKORNSHELL=\"$(KSH)\" $(FREETYPE_CFLAGS)
 

diff --git a/cde/programs/dthelp/dthelpgen/Makefile.am b/cde/programs/dthelp/dthelpgen/Makefile.am
index d333252b800c639c7982601f78e684dda01767a3..dd7be1f44625e1a9644f653e402d19b6423ce39c 100644 (file)
--- a/cde/programs/dthelp/dthelpgen/Makefile.am
+++ b/cde/programs/dthelp/dthelpgen/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = dthelpgen
 
 bin_SCRIPTS = dthelpgen.dtsh
 
-dthelpgen_CPPFLAGS = -I.. -DCDE_INSTALLATION_TOP=\"${prefix}\" \
+dthelpgen_CPPFLAGS = -I.. -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
                   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
 
 dthelpgen_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS}

diff --git a/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am
index e87953e91b4bfdb5fd451c7e602644b3272c5bdd..96e5688bba58d49337c0d34050162a044177f6cf 100644 (file)
--- a/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am
@@ -1,7 +1,7 @@
-icondir = ${prefix}/appconfig/icons/C
+icondir = $(CDE_INSTALLATION_TOP)/appconfig/icons/C
 
 if JAPANESE
-jdir = ${prefix}/appconfig/icons/ja
+jdir = $(CDE_INSTALLATION_TOP)/appconfig/icons/ja
 
 dist_j_DATA = bomb \
               bomb16 \

diff --git a/cde/programs/dtksh/ksh93/Makefile.am b/cde/programs/dtksh/ksh93/Makefile.am
index 690a722b29630feca6bcbfb013a314c87ff66373..3a98afbc2dda8a15481f201f10de21a7d8afc6ba 100644 (file)
--- a/cde/programs/dtksh/ksh93/Makefile.am
+++ b/cde/programs/dtksh/ksh93/Makefile.am
@@ -35,7 +35,7 @@ SUIDEXECDEFINES = \
         -DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \
         -DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \
         -DSUIDEXECPATH=\"${prefix}/bin/suid_exec\" \
-        -DCDE_INSTALLATION_TOP=\"${prefix}\"
+        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
 
 CCFLAGS = $(CDEBUGFLAGS) $(SUIDEXECDEFINES) $(STD_DEFINES) $(ANSI_DEFINES)
 ICCFLAGS = $(IFFECDEBUGFLAGS) $(STD_DEFINES) $(ANSI_DEFINES)

diff --git a/cde/programs/dtwm/Makefile.am b/cde/programs/dtwm/Makefile.am
index 0c05b35df4270cc1eff8cdfa00944e27696ed09e..cfebf0f04279617f32e02887631297558f478c32 100644 (file)
--- a/cde/programs/dtwm/Makefile.am
+++ b/cde/programs/dtwm/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = sys.dtwmrc Dtwm.defs
 CLEANFILES = sys.dtwmrc Dtwm.defs
 
 AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \
-             -DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"${prefix}\" \
+             -DBATCH_DRAG_REQUESTS -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
              -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
 
 dtwm_LDADD = $(DTCLIENTLIBS) -lXext $(XTOOLLIB)
@@ -40,7 +40,7 @@ dtwm_SOURCES = WmCDInfo.c      WmCDecor.c      WmCEvent.c \
 
 dtfplist_SOURCES = Print.c Parse.c DataBaseLoad.c WmParse.c Session.c
 
-SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
+SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
               -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
 
 Dtwm.defs: Dtwm.defs.src