diff options
author | Will Thompson <will@willthompson.co.uk> | 2020-07-31 13:00:10 +0100 |
---|---|---|
committer | Will Thompson <will@willthompson.co.uk> | 2020-07-31 13:00:10 +0100 |
commit | 2012bd78a33c6e1747e73512f9e113a0e85701f5 (patch) | |
tree | 5c003771080bff90b1694d1364c7129ec0706c18 /Makefile | |
parent | 5a6e13aa7bd0ced279f5935d080f68a160a47354 (diff) |
Makefile: simplify install target
Maybe it would be nice to do this as part of the Cabal build…
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -49,7 +49,7 @@ validate-metadata: org.freedesktop.Bustle.desktop org.freedesktop.Bustle.appdata appstream-util validate-relax org.freedesktop.Bustle.appdata.xml # This is only a SHOULD. Screenshots currently violate it because they # are hidpi. - appstream-util validate org.freedesktop.Bustle.appdata.xml || true + -appstream-util validate org.freedesktop.Bustle.appdata.xml dist/build/bustle-pcap: $(BUSTLE_PCAP_SOURCES) $(BUSTLE_PCAP_HEADERS) @mkdir -p dist/build @@ -66,16 +66,12 @@ dist/build/autogen/version.h: dist/build/autogen/version.txt echo '#define BUSTLE_VERSION "'`cat $<`'"' > $@ install: all - mkdir -p $(BINDIR) - cp $(BINARIES) $(BINDIR) - -mkdir -p $(MAN1DIR) - -cp $(MANPAGE) $(MAN1DIR) - mkdir -p $(DATADIR)/applications - cp $(DESKTOP_FILE) $(DATADIR)/applications - mkdir -p $(DATADIR)/appdata - cp $(APPDATA_FILE) $(DATADIR)/appdata - mkdir -p $(DATADIR)/icons/hicolor/scalable/apps - cp $(SCALABLE_ICONS) $(DATADIR)/icons/hicolor/scalable/apps + install -D -t $(BINDIR) $(BINARIES) + -install -Dt $(MAN1DIR) $(MANPAGE) + -install -Dt $(MAN1DIR) $(MANPAGE) + install -Dt $(DATADIR)/applications $(DESKTOP_FILE) + install -Dt $(DATADIR)/appdata $(APPDATA_FILE) + install -Dt $(DATADIR)/icons/hicolor/scalable/apps $(SCALABLE_ICONS) $(MAKE) update-icon-cache uninstall: |