aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2020-01-25 16:00:14 -0500
committerJason Woodward2020-01-25 16:00:14 -0500
commit74fddc6980eab3eb0161b856c4c0511c7bff535a (patch)
tree34b036969e664ff99412a34fed62f2cbe542f5a6
parentf238633e2ae795542fd21facac19cf7381267d99 (diff)
downloadgslapt-74fddc6980eab3eb0161b856c4c0511c7bff535a.tar.gz
fixup distcheck
-rw-r--r--Makefile.am62
-rw-r--r--configure.ac6
2 files changed, 41 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index f72dc0d..9c90aeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = src po ui
PKGDIR = `pwd`/pkg
PKGREL = 1
if POLKIT
-INSTALL_GSLAPT_POLKIT = mkdir -p $(DESTDIR)/$(bindir); echo -e "\#!/bin/sh\npkexec --disable-internal-agent $(sbindir)/gslapt \$$@" > $(DESTDIR)/$(bindir)/gslapt-polkit; chmod +x $(DESTDIR)/$(bindir)/gslapt-polkit; $(mkinstalldirs) $(DESTDIR)/$(POLKIT_SYSTEM_ACTIONS_DIR); $(INSTALL_DATA) org.jaos.gslapt.policy $(DESTDIR)/$(POLKIT_SYSTEM_ACTIONS_DIR)/org.jaos.gslapt.policy; sed -i -re 's,(exec\.path">).*(<\/annotate>),\1$(sbindir)/@PACKAGE@\2,g' $(DESTDIR)/$(POLKIT_SYSTEM_ACTIONS_DIR)/org.jaos.gslapt.policy
+polkit_actiondir = $(datadir)/polkit-1/actions
+INSTALL_GSLAPT_POLKIT = mkdir -p $(DESTDIR)/$(bindir); echo -e "\#!/bin/sh\npkexec --disable-internal-agent $(sbindir)/gslapt \$$@" > $(DESTDIR)/$(bindir)/gslapt-polkit; chmod +x $(DESTDIR)/$(bindir)/gslapt-polkit; $(mkinstalldirs) $(DESTDIR)/$(polkit_actiondir); $(INSTALL_DATA) org.jaos.gslapt.policy $(DESTDIR)/$(polkit_actiondir)/org.jaos.gslapt.policy; sed -i -re 's,(exec\.path">).*(<\/annotate>),\1$(sbindir)/@PACKAGE@\2,g' $(DESTDIR)/$(polkit_actiondir)/org.jaos.gslapt.policy
else
INSTALL_GSLAPT_POLKIT =
endif
@@ -16,26 +17,34 @@ EXTRA_DIST = \
gslapt-kde.desktop.in \
series_map.rc.in \
slack-desc \
- slack-required
+ slack-required \
+ org.jaos.gslapt.policy.in
+
+CLEANFILES = \
+ series_map.rc \
+ gslapt.desktop \
+ gslapt-kde.desktop \
+ org.jaos.gslapt.policy
+
all-local:
- @grep "=" series_map.rc.in | sed "s/_\(.*\)=\(.*\)/\1=\"\2\"/" > series_map.rc_quoted
- @sed "s/\_//" series_map.rc.in > series_map.rc
- @mkdir series_map
- @cd series_map && \
- intltool-merge --quoted-style -m -u ../po ../series_map.rc_quoted series_map.rc && \
+ grep "=" $(top_srcdir)/series_map.rc.in | sed "s/_\(.*\)=\(.*\)/\1=\"\2\"/" > $(top_builddir)/series_map.rc_quoted
+ sed "s/\_//" $(top_srcdir)/series_map.rc.in > $(top_builddir)/series_map.rc
+ mkdir $(top_builddir)/series_map
+ cd $(top_builddir)/series_map && \
+ intltool-merge --quoted-style -m -u $(top_srcdir)/po $(abs_top_builddir)/series_map.rc_quoted series_map.rc && \
for i in $$(find . -mindepth 1 -maxdepth 1 -type d -exec basename {} \;);do \
sed -i "s/\(.*\)=\(.*\)/\1[$$i]=\2/" $$i/series_map.rc && \
- sed "s/\"//g" $$i/series_map.rc >> ../series_map.rc; \
+ sed "s/\"//g" $$i/series_map.rc >> $(top_builddir)/series_map.rc; \
done
- @rm -rf series_map.rc_quoted series_map
- @sed -i -re 's,XXXDOTXXX,.,g' series_map.rc
- @sed -i -re 's,XXXSLASHXXX,/,g' series_map.rc
- @intltool-merge po/ -d -u gslapt.desktop.in gslapt.desktop
- @intltool-merge po/ -d -u gslapt-kde.desktop.in gslapt-kde.desktop
- @intltool-merge po/ -x -u org.jaos.gslapt.policy.in org.jaos.gslapt.policy
- @sed -i -re 's,(Exec=)(.*),\1$(sbindir)/@PACKAGE@,' gslapt.desktop gslapt-kde.desktop
- @sed -i -re 's,(Icon=).*?(/pixmaps.*),\1$(datadir)\2,' gslapt.desktop gslapt-kde.desktop
+ rm -rf $(top_builddir)/series_map.rc_quoted $(top_builddir)/series_map
+ sed -i -re 's,XXXDOTXXX,.,g' $(top_builddir)/series_map.rc
+ sed -i -re 's,XXXSLASHXXX,/,g' $(top_builddir)/series_map.rc
+ intltool-merge po/ -d -u $(top_srcdir)/gslapt.desktop.in $(top_builddir)/gslapt.desktop
+ intltool-merge po/ -d -u $(top_srcdir)/gslapt-kde.desktop.in $(top_builddir)/gslapt-kde.desktop
+ intltool-merge po/ -x -u $(top_srcdir)/org.jaos.gslapt.policy.in $(top_builddir)/org.jaos.gslapt.policy
+ sed -i -re 's,(Exec=)(.*),\1$(sbindir)/@PACKAGE@,' $(top_builddir)/gslapt.desktop $(top_builddir)/gslapt-kde.desktop
+ sed -i -re 's,(Icon=).*?(/pixmaps.*),\1$(datadir)\2,' $(top_builddir)/gslapt.desktop $(top_builddir)/gslapt-kde.desktop
install-data-local:
@@ -43,14 +52,25 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
$(mkinstalldirs) $(DESTDIR)/$(datadir)/applications; \
$(mkinstalldirs) $(DESTDIR)/$(datadir)/doc/@PACKAGE@ ; \
- $(INSTALL_DATA) AUTHORS ChangeLog COPYING FAQ README $(DESTDIR)/$(datadir)/doc/@PACKAGE@ ; \
- $(INSTALL_DATA) gslapt.desktop $(DESTDIR)/$(datadir)/applications/gslapt.desktop; \
- $(INSTALL_DATA) gslapt-kde.desktop $(DESTDIR)/$(datadir)/applications/gslapt-kde.desktop; \
- $(INSTALL_DATA) series_map.rc $(DESTDIR)/$(pkgdatadir)/; \
+ $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/COPYING $(top_srcdir)/FAQ $(top_srcdir)/README $(DESTDIR)/$(datadir)/doc/@PACKAGE@ ; \
+ $(INSTALL_DATA) $(top_builddir)/gslapt.desktop $(DESTDIR)/$(datadir)/applications/gslapt.desktop; \
+ $(INSTALL_DATA) $(top_builddir)/gslapt-kde.desktop $(DESTDIR)/$(datadir)/applications/gslapt-kde.desktop; \
+ $(INSTALL_DATA) $(top_builddir)/series_map.rc $(DESTDIR)/$(pkgdatadir)/; \
$(mkinstalldirs) $(DESTDIR)/$(datadir)/pixmaps; \
- $(INSTALL_DATA) ui/gslapt.png $(DESTDIR)/$(datadir)/pixmaps/
+ $(INSTALL_DATA) $(top_srcdir)/ui/gslapt.png $(DESTDIR)/$(datadir)/pixmaps/
$(INSTALL_GSLAPT_POLKIT)
+uninstall-local:
+ -rm -rf $(DESTDIR)/$(datadir)/doc/@PACKAGE@
+ -rm -f $(DESTDIR)/$(datadir)/applications/gslapt.desktop
+ -rm -f $(DESTDIR)/$(datadir)/applications/gslapt-kde.desktop
+ -rm -f $(DESTDIR)/$(datadir)/pixmaps/gslapt.png
+ -rm -f $(top_builddir)/series_map.rc $(DESTDIR)/$(pkgdatadir)/series_map.rc
+if POLKIT
+ -rm -f $(DESTDIR)/$(polkit_actiondir)/org.jaos.gslapt.policy
+ -rm -f $(DESTDIR)/$(bindir)/gslapt-polkit
+endif
+
pkg: all
@make install DESTDIR=$(PKGDIR)
$(mkinstalldirs) $(PKGDIR)/install
diff --git a/configure.ac b/configure.ac
index 8860339..cc4a430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,12 +83,6 @@ if test x"$use_polkit" = x"yes"; then
AC_PATH_PROG([PKEXEC], [pkexec])
AM_CONDITIONAL(POLKIT, true)
AS_AC_EXPAND(DATADIR, $datadir)
- PKG_CHECK_VAR(POLKIT_SYSTEM_ACTIONS_DIR, polkit-gobject-1, actiondir)
- if test x"$POLKIT_SYSTEM_ACTIONS_DIR" = x; then
- POLKIT_SYSTEM_ACTIONS_DIR="$DATADIR/polkit-1/actions"
- fi
- AC_SUBST(POLKIT_SYSTEM_ACTIONS_DIR)
- AC_DEFINE_UNQUOTED(POLKIT_SYSTEM_ACTIONS_DIR, "$POLKIT_SYSTEM_ACTIONS_DIR", [Where system actions dir for POLKIT is])
fi
GETTEXT_PACKAGE=gslapt