From: Jon Trulson Date: Mon, 23 Mar 2020 19:10:07 +0000 (-0600) Subject: Fix erroneous uses of ${prefix} rather than $(CDE_INSTALLATION_TOP) X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5852c4742f60ab5143ff0ad400e87c9d49c7e6a3;hp=a6e78364d074d9875895a77091c9f869f9299d04;p=oweals%2Fcde.git 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 dc76171d..787c6555 100644 --- 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 d26e90f4..f7aabd67 100644 --- 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 a317107e..a05e5751 100644 --- 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 65890aa7..bb9650c2 100644 --- 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 e09f4f5e..3fc934ba 100644 --- 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 2cc10907..1c8de8c6 100644 --- 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 d333252b..dd7be1f4 100644 --- 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 e87953e9..96e5688b 100644 --- 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 690a722b..3a98afbc 100644 --- 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 0c05b35d..cfebf0f0 100644 --- 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