diff options
| author | Reginald Kennedy <rk@rejii.com> | 2012-12-18 21:42:19 -0600 |
|---|---|---|
| committer | Dave Collins <davec@conformal.com> | 2012-12-18 21:42:19 -0600 |
| commit | c86951009a4d3c682e04bd51c7d98eaa30d4d1f5 (patch) | |
| tree | 17f85f2abb7f4dec04d6a5acc0217021c44aed9c | |
| parent | 5639a6bdb111baa5157200e2ad739f3c4f293a3d (diff) | |
| download | xombrero-c86951009a4d3c682e04bd51c7d98eaa30d4d1f5.tar.gz | |
Add install of $(PREFIX)/share/applications to Makefile.
This fixes issues when installing to a clean path such as with package creation.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | linux/Makefile | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 186141b..57584b9 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,7 @@ beforeinstall: install -m 755 -d ${PREFIX}/bin install -m 755 -d ${PREFIX}/man/man1/ install -m 755 -d ${PREFIX}/share/xombrero + install -m 755 -d ${PREFIX}/share/applications install -m 644 $(.CURDIR)/xombrero.css ${PREFIX}/share/xombrero install -m 644 $(.CURDIR)/xombrero.desktop ${PREFIX}/share/applications install -m 644 ${.CURDIR}/xombreroicon.png ${PREFIX}/share/xombrero diff --git a/linux/Makefile b/linux/Makefile index 3b2500c..e01e48e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -21,6 +21,7 @@ LDADD+= $(shell pkg-config --libs $(LIBS)) $(JS_LD) -ldl -lgcrypt -lX11 PREFIX?= /usr/local BINDIR?= $(PREFIX)/bin LIBDIR?= $(PREFIX)/lib +APPDIR?= $(PREFIX)/share/applications MANDIR?= $(PREFIX)/share/man RESDIR?= $(PREFIX)/share/xombrero @@ -61,10 +62,11 @@ install: all install -m 755 -d $(DESTDIR)$(LIBDIR) install -m 755 -d $(DESTDIR)$(MANDIR)/man1 install -m 755 -d $(DESTDIR)$(RESDIR) + install -m 755 -d $(DESTDIR)$(APPDIR) install -m 755 xombrero $(DESTDIR)$(BINDIR) install -m 644 ../xombrero.1 $(DESTDIR)$(MANDIR)/man1/xombrero.1 install -m 644 ../xombrero.css $(DESTDIR)$(RESDIR) - install -m 644 ../xombrero.desktop $(DESTDIR)$(PREFIX)/share/applications + install -m 644 ../xombrero.desktop $(DESTDIR)$(APPDIR) install -m 644 ../xombreroicon16.png $(DESTDIR)$(RESDIR) install -m 644 ../xombreroicon32.png $(DESTDIR)$(RESDIR) install -m 644 ../xombreroicon48.png $(DESTDIR)$(RESDIR) |