debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtfile/Makefile.am
View File

@@ -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)

2
cde/programs/dthelp/dthelpgen/Makefile.am
View File

@@ -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}

4
cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am
View File

@@ -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 \

2
cde/programs/dtksh/ksh93/Makefile.am
View File

@@ -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)

4
cde/programs/dtwm/Makefile.am
View File

@@ -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