mirror of https://github.com/edeproject/ede.git
Refactored globals used by build system
This commit is contained in:
parent
ee1407d79f
commit
ed531ba6fa
14
Jamconfig.in
14
Jamconfig.in
|
@ -36,13 +36,13 @@ LINKCMD ?= "ln -s" ;
|
||||||
EDE_VERSION ?= "@EDE_VERSION@" ;
|
EDE_VERSION ?= "@EDE_VERSION@" ;
|
||||||
|
|
||||||
# directories used by build system
|
# directories used by build system
|
||||||
PREFIX ?= "$(prefix)" ;
|
PREFIX ?= "$(prefix)" ;
|
||||||
EDEBINDIR ?= "$(bindir)" ;
|
EDE_BIN_DIR ?= "$(bindir)" ;
|
||||||
EDECONFIGDIR ?= "$(datadir)/config" ;
|
EDE_CONFIG_DIR ?= "$(datadir)/config" ;
|
||||||
EDEICONDIR ?= "$(datadir)/icons" ;
|
EDE_ICON_DIR ?= "$(datadir)/icons" ;
|
||||||
EDEDESKTOPDIR ?= "$(datadir)/desktop" ;
|
EDE_DESKTOP_FILE_DIR ?= "$(datadir)/desktop" ;
|
||||||
EDEMIMEDIR ?= "$(datadir)/mime" ;
|
EDE_MIME_DIR ?= "$(datadir)/mime" ;
|
||||||
EDEDOCDIR ?= "$(docdir)/ede-$(EDE_VERSION)" ;
|
EDE_DOC_DIR ?= "$(docdir)/ede-$(EDE_VERSION)" ;
|
||||||
|
|
||||||
OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ;
|
OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ;
|
||||||
DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ;
|
DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ;
|
||||||
|
|
|
@ -84,29 +84,35 @@ rule InstallData
|
||||||
# InstallEdeProgram [targets] ;
|
# InstallEdeProgram [targets] ;
|
||||||
rule InstallEdeProgram
|
rule InstallEdeProgram
|
||||||
{
|
{
|
||||||
InstallProgram $(EDEBINDIR) : $(<) ;
|
InstallProgram $(EDE_BIN_DIR) : $(<) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# InstallEdeIcons [app-dir:] [targets] ;
|
# InstallEdeIcons [app-dir:] [targets] ;
|
||||||
rule InstallEdeIcons
|
rule InstallEdeIcons
|
||||||
{
|
{
|
||||||
if $(2) {
|
if $(2) {
|
||||||
InstallData [ FDirName $(EDEICONDIR) $(1) ] : $(2) ;
|
InstallData [ FDirName $(EDE_ICON_DIR) $(1) ] : $(2) ;
|
||||||
} else {
|
} else {
|
||||||
InstallData $(EDEICONDIR) : $(1) ;
|
InstallData $(EDE_ICON_DIR) : $(1) ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# InstallEdeDesktopFiles [targets] ;
|
# InstallEdeDesktopFiles [targets] ;
|
||||||
rule InstallEdeDesktopFiles
|
rule InstallEdeDesktopFiles
|
||||||
{
|
{
|
||||||
InstallData $(EDEDESKTOPDIR) : $(<) ;
|
InstallData $(EDE_DESKTOP_FILE_DIR) : $(<) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# InstallEdeDesktopFiles [targets] ;
|
# InstallEdeConfigFilesOld [targets] ;
|
||||||
|
rule InstallEdeConfigFilesOld
|
||||||
|
{
|
||||||
|
InstallData $(EDE_CONFIG_DIR_OLD) : $(<) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
# InstallEdeConfigFiles [targets] ;
|
||||||
rule InstallEdeConfigFiles
|
rule InstallEdeConfigFiles
|
||||||
{
|
{
|
||||||
InstallData $(EDECONFIGDIR) : $(<) ;
|
InstallData $(EDE_CONFIG_DIR) : $(<) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# InstallEdeMimeFiles [targets] ;
|
# InstallEdeMimeFiles [targets] ;
|
||||||
|
@ -124,28 +130,28 @@ rule InstallEdeMimeFiles
|
||||||
|
|
||||||
update_cmd = $(matches[1]) ;
|
update_cmd = $(matches[1]) ;
|
||||||
|
|
||||||
# Files must be instaled in $(EDEMIMEDIR)/packages or
|
# Files must be instaled in $(EDE_MIME_DIR)/packages or
|
||||||
# update-mime-database will not see it
|
# update-mime-database will not see it
|
||||||
pakdir = [ FDirName $(EDEMIMEDIR) packages ] ;
|
pakdir = [ FDirName $(EDE_MIME_DIR) packages ] ;
|
||||||
InstallData $(pakdir) : $(<) ;
|
InstallData $(pakdir) : $(<) ;
|
||||||
|
|
||||||
MIME_UPDATE_DATABASE = $(update_cmd) ;
|
MIME_UPDATE_DATABASE = $(update_cmd) ;
|
||||||
|
|
||||||
# Shut up jam warning
|
# Shut up jam warning
|
||||||
NotFile $(EDEMIMEDIR) ;
|
NotFile $(EDE_MIME_DIR) ;
|
||||||
|
|
||||||
# Call update-mime-database after install/uninstall
|
# Call update-mime-database after install/uninstall
|
||||||
# Just hoping this will be executed after files are copied/removed...
|
# Just hoping this will be executed after files are copied/removed...
|
||||||
MimeUpdater install : $(EDEMIMEDIR) ;
|
MimeUpdater install : $(EDE_MIME_DIR) ;
|
||||||
MimeUpdater uninstall : $(EDEMIMEDIR) ;
|
MimeUpdater uninstall : $(EDE_MIME_DIR) ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# InstallEdeDoc [targets] ;
|
# InstallEdeDoc [targets] ;
|
||||||
# Installs targets to EDEDOCDIR directory
|
# Installs targets to EDE_DOC_DIR directory
|
||||||
rule InstallEdeDoc
|
rule InstallEdeDoc
|
||||||
{
|
{
|
||||||
InstallData $(EDEDOCDIR) : $(1) ;
|
InstallData $(EDE_DOC_DIR) : $(1) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
actions Install1
|
actions Install1
|
||||||
|
|
|
@ -38,7 +38,7 @@ rule MakeScript
|
||||||
|
|
||||||
actions existing MakeScript1
|
actions existing MakeScript1
|
||||||
{
|
{
|
||||||
cat "$(>)" | $(SED) -e 's|@ededocdir@|$(EDEDOCDIR)|' > "$(<)"
|
cat "$(>)" | $(SED) -e 's|@ededocdir@|$(EDE_DOC_DIR)|' > "$(<)"
|
||||||
}
|
}
|
||||||
|
|
||||||
MakeScript ede-help : ede-help.in ;
|
MakeScript ede-help : ede-help.in ;
|
||||||
|
|
Loading…
Reference in New Issue