Makefile fixes

i-nex · Jun 30, 2014 · de424ad · de424ad
1 parent fd67736
commit de424ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/changelogs/Makefile b/changelogs/Makefile
@@ -11,6 +11,7 @@ install-changelogs:
 	install -Dm644 $(CHANGELOG_FILES) $(DESTDIR)$(PREFIX)$(DOCSDIR)/
 
 compress-changelogs:
+
 	@echo -e '\033[1;32mCompress Changelogs...\033[0m'
 	gzip -9 "$(DESTDIR)$(PREFIX)$(DOCSDIR)/changelog-0.4.6"
 	gzip -9 "$(DESTDIR)$(PREFIX)$(DOCSDIR)/changelog-0.4.8"

diff --git a/pixmaps/Makefile b/pixmaps/Makefile
@@ -1,25 +1,23 @@
-#include ../buildsys.mk
-INSTALL = install
-MKDIR_P = mkdir -p
-datarootdir = /usr/share
+#!/usr/bin/make -f
+include ../i-nex.mk
 make: 
 
 	convert i-nex.png -resize 16x16 i-nex-16.png
 	convert i-nex.png -resize 32x32 i-nex-32.png
 	convert i-nex.png -resize 128x128 i-nex-128.png
 
 install:
-	${MKDIR_P} ${DESTDIR}${datarootdir}/pixmaps
-	${INSTALL} -m 644 i-nex.png "${DESTDIR}${datarootdir}/pixmaps/"
-	${INSTALL} -m 644 i-nex-16.png "${DESTDIR}${datarootdir}/pixmaps/"
-	${INSTALL} -m 644 i-nex-32.png "${DESTDIR}${datarootdir}/pixmaps/"
-	${INSTALL} -m 644 i-nex-128.png "${DESTDIR}${datarootdir}/pixmaps/"
+	mkdir -p ${DESTDIR}${datarootdir}/pixmaps
+	${INSTALL} 644 i-nex.png $(DESTDIR)$(PREFIX)/share/pixmaps/
+	${INSTALL} 644 i-nex-16.png $(DESTDIR)$(PREFIX)/share/pixmaps/
+	${INSTALL} 644 i-nex-32.png $(DESTDIR)$(PREFIX)/share/pixmaps/
+	${INSTALL} 644 i-nex-128.png $(DESTDIR)$(PREFIX)/share/pixmaps/
 
 uninstall:
 
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.png" ; fi
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.png" ; fi
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-128.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-128.png" ; fi
+	if test -f $(DESTDIR)$(PREFIX)/share/pixmaps/i-nex-16.png ; then ${RM} $(DESTDIR)$(PREFIX)/share/pixmaps/i-nex-16.png ; fi
+	if test -f ${DESTDIR}$(PREFIX)/share/pixmaps/i-nex-32.png ; then ${RM} $(DESTDIR)$(PREFIX)/share/pixmaps/i-nex-32.png ; fi
+	if test -f ${DESTDIR}$(PREFIX)/share/pixmaps/i-nex-128.png ; then ${RM} $(DESTDIR)$(PREFIX)/share/pixmaps/i-nex-128.png ; fi
 
 clean: