From b35e6d57ea65e85e2644dc839807a9de14e05c68 Mon Sep 17 00:00:00 2001 From: Bandie Date: Mon, 3 Dec 2018 22:10:09 +0100 Subject: [PATCH] Static install for icons since launchpad is making it hard --- src/pam_panic_config/Makefile.am | 1 - src/pam_panic_config/icons/scalable/Makefile.am | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am index 1f4cb04..dd0cd08 100644 --- a/src/pam_panic_config/Makefile.am +++ b/src/pam_panic_config/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable bin_SCRIPTS = pam_panic_config %: %.prebuild.sh - make clean-local { sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); version=$$(echo $(VERSION)); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/;s/__VERSION__/$$version/" $< > $@ ; } chmod +x $@ diff --git a/src/pam_panic_config/icons/scalable/Makefile.am b/src/pam_panic_config/icons/scalable/Makefile.am index 1058130..320b320 100644 --- a/src/pam_panic_config/icons/scalable/Makefile.am +++ b/src/pam_panic_config/icons/scalable/Makefile.am @@ -1,6 +1,7 @@ appicondir=$(datadir)/icons/hicolor/scalable/apps -appicon_DATA=pampanic.svg pixmapsdir=$(datadir)/pixmaps -install-exec-hook: +install: + $(MKDIR_P) $(appicondir) + $(install_sh_DATA) pampanic.svg $(appicondir)/ test -L $(pixmapsdir)/pampanic.svg && echo "Symlink exists" || { $(MKDIR_P) $(pixmapsdir) ; $(LN_S) $(appicondir)/pampanic.svg $(pixmapsdir)/pampanic.svg ; }