Merge pull request #97 from Bandie/master

Static install for icons since launchpad is making it hard
This commit is contained in:
Bandie 2018-12-03 22:14:00 +01:00 committed by GitHub
commit d6bf4530e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,6 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable
bin_SCRIPTS = pam_panic_config bin_SCRIPTS = pam_panic_config
%: %.prebuild.sh %: %.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/" $< > $@ ; } { 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 $@ chmod +x $@

View File

@ -1,6 +1,7 @@
appicondir=$(datadir)/icons/hicolor/scalable/apps appicondir=$(datadir)/icons/hicolor/scalable/apps
appicon_DATA=pampanic.svg
pixmapsdir=$(datadir)/pixmaps 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 ; } test -L $(pixmapsdir)/pampanic.svg && echo "Symlink exists" || { $(MKDIR_P) $(pixmapsdir) ; $(LN_S) $(appicondir)/pampanic.svg $(pixmapsdir)/pampanic.svg ; }