diff options
| author | Samuel Lidén Borell <samuel@primekey.se> | 2012-04-05 17:00:11 +0200 |
|---|---|---|
| committer | Samuel Lidén Borell <samuel@primekey.se> | 2012-04-05 17:00:11 +0200 |
| commit | 8d67e8bda0a2aa458425b3c43045e7239b6a4842 (patch) | |
| tree | fb8f744bde468c2c14ffed68a50c7c6c4b7a5381 | |
| parent | ceb41c32502b7ce7865cfea07a1d1855eeaee5ed (diff) | |
| download | fribid-8d67e8bda0a2aa458425b3c43045e7239b6a4842.tar.gz fribid-8d67e8bda0a2aa458425b3c43045e7239b6a4842.tar.bz2 fribid-8d67e8bda0a2aa458425b3c43045e7239b6a4842.zip | |
Allow --libexecdir to be configured independently of --libdir
| -rw-r--r-- | client/Makefile | 8 | ||||
| -rw-r--r-- | common/defines.h | 3 | ||||
| -rwxr-xr-x | configure | 18 |
3 files changed, 20 insertions, 9 deletions
diff --git a/client/Makefile b/client/Makefile index 0271122..ac69436 100644 --- a/client/Makefile +++ b/client/Makefile @@ -29,7 +29,7 @@ LINKFLAGS=$(CFLAGS) $(LDFLAGS) -Wl,--as-needed LIBS=`pkg-config --libs $(PKG_DEPS)` # Files to be installed -LIB_PATH=`../configure --internal--get-define=LIB_PATH` +LIBEXEC_PATH=`../configure --internal--get-define=LIBEXEC_PATH` SHARE_PATH=`../configure --internal--get-define=SHARE_PATH` UI_PATH=`../configure --internal--get-define=UI_PATH` SIGNING_EXECUTABLE=`../configure --internal--get-define=SIGNING_EXECUTABLE` @@ -66,14 +66,14 @@ clean: rm -f $(OBJECTS) sign install: all - install -d $(DESTDIR)$(LIB_PATH) + install -d $(DESTDIR)$(LIBEXEC_PATH) install -d $(DESTDIR)$(UI_PATH) - install sign $(DESTDIR)$(LIB_PATH) + install sign $(DESTDIR)$(LIBEXEC_PATH) install -m 644 gtk/sign.xml $(DESTDIR)$(UI_PATH) uninstall: rm -f $(DESTDIR)$(SIGNING_EXECUTABLE) $(DESTDIR)$(UI_GTK_XML) - [ ! -d $(DESTDIR)$(LIB_PATH) ] || rmdir $(DESTDIR)$(LIB_PATH) 2> /dev/null || true + [ ! -d $(DESTDIR)$(LIBEXEC_PATH) ] || rmdir $(DESTDIR)$(LIBEXEC_PATH) 2> /dev/null || true [ ! -d $(DESTDIR)$(UI_PATH) ] || rmdir $(DESTDIR)$(UI_PATH) [ ! -d $(DESTDIR)$(SHARE_PATH) ] || rmdir $(DESTDIR)$(SHARE_PATH) diff --git a/common/defines.h b/common/defines.h index 594b943..7f9efff 100644 --- a/common/defines.h +++ b/common/defines.h @@ -44,10 +44,11 @@ #define STATUSDOMAIN ".status.fribid.se" #define LIB_PATH LIBDIR "/" BINNAME +#define LIBEXEC_PATH LIBEXECDIR "/" BINNAME #define SHARE_PATH DATADIR "/" BINNAME #define DOC_PATH DATADIR "/doc/" BINNAME -#define SIGNING_EXECUTABLE LIB_PATH "/sign" +#define SIGNING_EXECUTABLE LIBEXEC_PATH "/sign" #define UI_PATH SHARE_PATH "/ui" #define UI_GTK_XML UI_PATH "/sign.xml" #define NPAPI_PLUGIN_LIB LIB_PATH "/libfribidplugin.so" @@ -33,6 +33,7 @@ else fi libdir="" +libexecdir="" datadir="" localedir="" mandir="" @@ -69,6 +70,7 @@ Options: --exec-prefix=PATH Sets the installation prefix for executable files. The default is to use the same prefix for all files. --libdir=PATH Sets the directory for libraries. [EPREFIX/$multilib] + --libexecdir=PATH Sets the directory for internal executables. [LIBDIR] --datadir=PATH Sets the directory for architecture-independent data. [PREFIX/share] --localedir=PATH Sets the directory for translations [DATADIR/locale] @@ -96,6 +98,9 @@ Options: --libdir=*) libdir=${flag#--libdir=} ;; + --libexecdir=*) + libexecdir=${flag#--libexecdir=} + ;; --datadir=*) datadir=${flag#--datadir=} ;; @@ -205,6 +210,10 @@ if [ -z "$libdir" ]; then libdir="$execPath/$multilib" fi +if [ -z "$libexecdir" ]; then + libexecdir="$libdir" +fi + if [ -z "$datadir" ]; then datadir="$prefixPath/share" fi @@ -324,10 +333,11 @@ cat <<EOT >"$CONFFILE" #define PREFIX "$prefixPath" #define EPREFIX "$execPath" -#define LIBDIR "$libdir" -#define DATADIR "$datadir" -#define LOCALEDIR "$localedir" -#define MANDIR "$mandir" +#define LIBDIR "$libdir" +#define LIBEXECDIR "$libexecdir" +#define DATADIR "$datadir" +#define LOCALEDIR "$localedir" +#define MANDIR "$mandir" #define NPAPI_PLUGIN_PATHS "$pluginPaths" |