diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-18 11:11:03 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-18 11:11:03 +0200 |
| commit | c635633e6b36ec44a8baae7b50956f19cf44dd31 (patch) | |
| tree | 9d479c2df97b3bf6257f4d67dd42a2e6901785a3 | |
| parent | c6486d01a21fabbfc3f0023d9e9e8c4a203d669e (diff) | |
| download | xdg-app-c635633e6b36ec44a8baae7b50956f19cf44dd31.tar.gz | |
Add --with-system-install-dir option0.6.0
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 20 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 36c7bb8..3540aa2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,19 +33,19 @@ EXTRA_DIST += $(service_in_files) FLATPAK_BINDIR=$(bindir) -AM_CPPFLAGS = \ - -DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \ - -DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/flatpak\"\ - -DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\"\ - -DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \ - -DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \ - -DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \ - -DHELPER=\"$(libdir)/flatpak/bwrap\" \ +AM_CPPFLAGS = \ + -DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \ + -DFLATPAK_SYSTEMDIR=\"$(SYSTEM_INSTALL_DIR)\" \ + -DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\" \ + -DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \ + -DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \ + -DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \ + -DHELPER=\"$(libdir)/flatpak/bwrap\" \ -DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\" \ - -DG_LOG_DOMAIN=\"flatpak\" \ - -I$(srcdir)/libglnx \ - -I$(srcdir)/common \ - -I$(builddir)/common \ + -DG_LOG_DOMAIN=\"flatpak\" \ + -I$(srcdir)/libglnx \ + -I$(srcdir)/common \ + -I$(builddir)/common \ $(NULL) triggersdir = $(pkgdatadir)/triggers diff --git a/configure.ac b/configure.ac index 66c3ea3..4c51c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,14 @@ if test x$have_libelf != xyes; then AC_MSG_ERROR([libelf not found]) fi +AC_ARG_WITH(system-install-dir, + [AS_HELP_STRING([--with-system-install-dir=DIR], + [Location of system installation [LOCALSTATEDIR/lib/flatpak]])], + [], + [with_system_install_dir='$(localstatedir)/lib/flatpak']) +SYSTEM_INSTALL_DIR=$with_system_install_dir +AC_SUBST(SYSTEM_INSTALL_DIR) + dnl This only checks for the header, not the library. AC_ARG_WITH([dwarf-header], [AS_HELP_STRING([--with-dwarf-header], |