external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/lib/DtHelp/Makefile.am
View file

@ -9,7 +9,7 @@ dist_cfg_DATA = CDE.lcx
lib_LTLIBRARIES = libDtHelp.la lib_LTLIBRARIES = libDtHelp.la
libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \ 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)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@ @DT_INCDIR@ @DTI_INCDIR@

2
cde/lib/DtHelp/il/Makefile.am
View file

@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_LTLIBRARIES = libil.la 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)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@ @DT_INCDIR@ @DTI_INCDIR@

2
cde/lib/DtSearch/raima/Makefile.am
View file

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

2
cde/lib/DtSvc/Makefile.am
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 # USe CPPFLAGS so it will apply to both C and C++ components
libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \ 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)\" -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
if SOLARIS if SOLARIS

2
cde/lib/DtWidget/Makefile.am
View file

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

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

@ -1,4 +1,4 @@
configdir = ${prefix}/config/C configdir = $(CDE_INSTALLATION_TOP)/config/C
SUBDIRS = dtcopy SUBDIRS = dtcopy
@ -12,7 +12,7 @@ dist_config_DATA = dtfile.config
dist_bin_SCRIPTS = dtfile_error dist_bin_SCRIPTS = dtfile_error
dtfile_CPPFLAGS = -I./dtcopy -DSHAPE -D_ILS_MACROS -DSUN_PERF \ 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)\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KSH)\" $(FREETYPE_CFLAGS) -DKORNSHELL=\"$(KSH)\" $(FREETYPE_CFLAGS)

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

@ -4,7 +4,7 @@ bin_PROGRAMS = dthelpgen
bin_SCRIPTS = dthelpgen.dtsh 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)\" -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
dthelpgen_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} 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 if JAPANESE
jdir = ${prefix}/appconfig/icons/ja jdir = $(CDE_INSTALLATION_TOP)/appconfig/icons/ja
dist_j_DATA = bomb \ dist_j_DATA = bomb \
bomb16 \ bomb16 \

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

@ -35,7 +35,7 @@ SUIDEXECDEFINES = \
-DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \ -DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \
-DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \ -DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \
-DSUIDEXECPATH=\"${prefix}/bin/suid_exec\" \ -DSUIDEXECPATH=\"${prefix}/bin/suid_exec\" \
-DCDE_INSTALLATION_TOP=\"${prefix}\" -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
CCFLAGS = $(CDEBUGFLAGS) $(SUIDEXECDEFINES) $(STD_DEFINES) $(ANSI_DEFINES) CCFLAGS = $(CDEBUGFLAGS) $(SUIDEXECDEFINES) $(STD_DEFINES) $(ANSI_DEFINES)
ICCFLAGS = $(IFFECDEBUGFLAGS) $(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 CLEANFILES = sys.dtwmrc Dtwm.defs
AM_CPPFLAGS = -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE -DUNMAP_ON_RESTART \ 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)\" -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
dtwm_LDADD = $(DTCLIENTLIBS) -lXext $(XTOOLLIB) 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 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) -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)
Dtwm.defs: Dtwm.defs.src Dtwm.defs: Dtwm.defs.src