(Pascal Stumpf) Makefile.am change several places where ${prefix} should be $(CDE_INSTALLATION_TOP)
This commit is contained in:
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||||||
|
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
|
|
||||||
appdefaultsdir = ${prefix}/app-defaults/C
|
appdefaultsdir = $(CDE_INSTALLATION_TOP)/app-defaults/C
|
||||||
|
|
||||||
ABINCLUDES = -I../include -I../include/ab_private -I../libABil
|
ABINCLUDES = -I../include -I../include/ab_private -I../libABil
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ dtfile_SOURCES = ChangeDir.c ChangeDirP.c Command.c Common.c \
|
|||||||
|
|
||||||
# Mind the quoting here...
|
# Mind the quoting here...
|
||||||
SCRIPTFLAGS = -DSHAPE -D_ILS_MACROS -DSUN_PERF \
|
SCRIPTFLAGS = -DSHAPE -D_ILS_MACROS -DSUN_PERF \
|
||||||
-DCDE_INSTALLATION_TOP="${prefix}" \
|
-DCDE_INSTALLATION_TOP="$(CDE_CONFIGURATION_TOP)" \
|
||||||
-DCDE_CONFIGURATION_TOP="$(CDE_CONFIGURATION_TOP)" \
|
-DCDE_CONFIGURATION_TOP="$(CDE_CONFIGURATION_TOP)" \
|
||||||
-DKORNSHELL="$(KSH)"
|
-DKORNSHELL="$(KSH)"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
|
AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
|
||||||
-DCDE_INSTALLATION_TOP=${prefix} \
|
-DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
|
||||||
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
|
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
|
||||||
-DFONTALIASESCONFDIR=$(sysconfdir)/$(PACKAGE_TARNAME)/fontaliases \
|
-DFONTALIASESCONFDIR=$(sysconfdir)/$(PACKAGE_TARNAME)/fontaliases \
|
||||||
-DFONTALIASESDATADIR=$(pkgdatadir)/fontaliases \
|
-DFONTALIASESDATADIR=$(pkgdatadir)/fontaliases \
|
||||||
|
|||||||
Reference in New Issue
Block a user