mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Dumped builtin paths as distros can't use them for packaging. Noted by Thierry from NuTyX project.

Browse Source
This commit is contained in:
Sanel Zukan
2010-01-18 14:38:22 +00:00
parent b057ef45a1
commit fcf71678b0
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Jamconfig.in
View File

@ -19,7 +19,14 @@ includedir ?= "@includedir@" ;
libdir ?= "@libdir@" ; libdir ?= "@libdir@" ;
mandir ?= "@mandir@" ; mandir ?= "@mandir@" ;
srcdir ?= "@abs_srcdir@" ; srcdir ?= "@abs_srcdir@" ;
# by default, configure will use '$(prefix)/etc' for sysconfdir which is pretty dumb
# as (by default) things installed in '/usr' put config data in '/etc'
if $(prefix) = "/" || $(prefix) = "/usr" {
sysconfdir ?= "/etc" ;
} else {
sysconfdir ?= "@sysconfdir@" ; sysconfdir ?= "@sysconfdir@" ;
}
# compiler # compiler
CC = @CC@ ; CC = @CC@ ;
@ -48,8 +55,8 @@ EDE_PREFIX_SUBDIR ?= "ede" ;
PREFIX ?= "$(prefix)" ; PREFIX ?= "$(prefix)" ;
EDE_BIN_DIR ?= "$(bindir)" ; EDE_BIN_DIR ?= "$(bindir)" ;
EDE_DATA_DIR ?= "$(datadir)" ; EDE_DATA_DIR ?= "$(datadir)" ;
EDE_CONFIG_DIR ?= "/etc/xdg/$(EDE_PREFIX_SUBDIR)" ; EDE_CONFIG_DIR ?= "$(sysconfdir)/xdg/$(EDE_PREFIX_SUBDIR)" ;
EDE_MENU_DIR ?= "/etc/xdg/menus" ; # use XDG default for menu dir EDE_MENU_DIR ?= "$(sysconfdir)/xdg/menus" ; # use XDG default for menu dir
EDE_ICON_DIR ?= "$(EDE_DATA_DIR)/icons" ; EDE_ICON_DIR ?= "$(EDE_DATA_DIR)/icons" ;
EDE_MIME_DIR ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path EDE_MIME_DIR ?= "$(EDE_DATA_DIR)/mime" ; # use XDG mime path
EDE_DOC_DIR ?= "$(docdir)/ede-$(EDE_VERSION)" ; EDE_DOC_DIR ?= "$(docdir)/ede-$(EDE_VERSION)" ;
@ -57,6 +64,9 @@ EDE_THEMES_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/themes" ;
EDE_TIPS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/tips" ; EDE_TIPS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/tips" ;
EDE_PANEL_APPLETS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/panel-applets" ; EDE_PANEL_APPLETS_DIR ?= "$(EDE_DATA_DIR)/$(EDE_PREFIX_SUBDIR)/panel-applets" ;
DBUS_SERVICE_DIR ?= "$(datarootdir)/dbus-1/services" ;
XSESSIONS_DIR ?= "$(datarootdir)/xsessions" ;
OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ; OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ;
DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ; DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ;
LARGEFILEFLAGS ?= @LARGEFILE@ ; LARGEFILEFLAGS ?= @LARGEFILE@ ;
@ -137,7 +147,5 @@ if $(SUN_COMPILER) {
PTHREAD_LIBS ?= @PTHREAD_LIBS@ ; PTHREAD_LIBS ?= @PTHREAD_LIBS@ ;
} }
DBUS_SERVICE_DIR ?= @DBUS_SERVICE_DIR@ ;
# do not touch this # do not touch this
JAMCONFIG_READ = "yes" ; JAMCONFIG_READ = "yes" ;

4
configure.in
View File

@ -242,10 +242,6 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
EDE_CHECK_DIR(DBUS_SERVICE_DIR,
[/usr/share/dbus-1/services /usr/local/share/dbus-1/services "$datarootdir/dbus-1/services"])
EDE_INIT_JAM EDE_INIT_JAM
AC_SUBST(EDE_VERSION) AC_SUBST(EDE_VERSION)

2
data/Jamfile
View File

@ -16,7 +16,7 @@ InstallEdeProgram startede ;
InstallEdeConfigFiles $(CONFS) ; InstallEdeConfigFiles $(CONFS) ;
# install entry for login/desktop managers # install entry for login/desktop managers
InstallData /usr/share/xsessions : ede.desktop ; InstallData $(XSESSIONS_DIR) : ede.desktop ;
Clean distclean : ede.desktop ; Clean distclean : ede.desktop ;
SubInclude TOP data mime-types ; SubInclude TOP data mime-types ;