forked from Mirrors/flatpak-builder
Add --with-system-install-dir option
parent
c6486d01a2
commit
c635633e6b
24
Makefile.am
24
Makefile.am
|
@ -33,19 +33,19 @@ EXTRA_DIST += $(service_in_files)
|
||||||
|
|
||||||
FLATPAK_BINDIR=$(bindir)
|
FLATPAK_BINDIR=$(bindir)
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \
|
-DFLATPAK_BINDIR=\"$(FLATPAK_BINDIR)\" \
|
||||||
-DFLATPAK_SYSTEMDIR=\"$(localstatedir)/lib/flatpak\"\
|
-DFLATPAK_SYSTEMDIR=\"$(SYSTEM_INSTALL_DIR)\" \
|
||||||
-DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\"\
|
-DFLATPAK_CONFIGDIR=\"$(sysconfdir)/flatpak\" \
|
||||||
-DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \
|
-DFLATPAK_BASEDIR=\"$(pkgdatadir)\" \
|
||||||
-DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \
|
-DFLATPAK_TRIGGERDIR=\"$(pkgdatadir)/triggers\" \
|
||||||
-DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \
|
-DSYSTEM_FONTS_DIR=\"$(SYSTEM_FONTS_DIR)\" \
|
||||||
-DHELPER=\"$(libdir)/flatpak/bwrap\" \
|
-DHELPER=\"$(libdir)/flatpak/bwrap\" \
|
||||||
-DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\" \
|
-DDBUSPROXY=\"$(libexecdir)/flatpak-dbus-proxy\" \
|
||||||
-DG_LOG_DOMAIN=\"flatpak\" \
|
-DG_LOG_DOMAIN=\"flatpak\" \
|
||||||
-I$(srcdir)/libglnx \
|
-I$(srcdir)/libglnx \
|
||||||
-I$(srcdir)/common \
|
-I$(srcdir)/common \
|
||||||
-I$(builddir)/common \
|
-I$(builddir)/common \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
triggersdir = $(pkgdatadir)/triggers
|
triggersdir = $(pkgdatadir)/triggers
|
||||||
|
|
|
@ -238,6 +238,14 @@ if test x$have_libelf != xyes; then
|
||||||
AC_MSG_ERROR([libelf not found])
|
AC_MSG_ERROR([libelf not found])
|
||||||
fi
|
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.
|
dnl This only checks for the header, not the library.
|
||||||
AC_ARG_WITH([dwarf-header],
|
AC_ARG_WITH([dwarf-header],
|
||||||
[AS_HELP_STRING([--with-dwarf-header],
|
[AS_HELP_STRING([--with-dwarf-header],
|
||||||
|
|
Loading…
Reference in New Issue