Bring over configure imporvements from dhcpcd.
[dhcpcd-ui] / mk / icon.mk
index 090064ee4b81b77c7c6600b267ee759b32b3abca..01040375531f3b55789322c216295a1dd620de6c 100644 (file)
@@ -1,9 +1,10 @@
-include ${MK}/sys.mk
+include ${MKDIR}/sys.mk
 
 SIZEDIR?=      ${SIZE}x${SIZE}
-ICONDIR?=      ${PREFIX}/share/dhcpcd/icons/hicolor/${SIZEDIR}/${CATEGORY}
+ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
+IDIR=          ${ICONDIR}/hicolor/${SIZEDIR}/${CATEGORY}
 
-RSVG?=         rsvg
+RSVG_CONVERT?= rsvg-convert
 
 ICONS+=                ${SRCS:.svg=.png}
 CLEANFILES+=   ${SRCS:.svg=.png}
@@ -13,11 +14,11 @@ CLEANFILES+=        ${SRCS:.svg=.png}
 all: ${ICONS}
 
 .svg.png:
-       ${RSVG} -h ${SIZE} -w ${SIZE} $< $@
+       ${RSVG_CONVERT} -h ${SIZE} -w ${SIZE} $< >$@
 
 _iconinstall: ${ICONS}
-       ${INSTALL} -d ${DESTDIR}${ICONDIR}
-       ${INSTALL} -m ${BINMODE} ${ICONS} ${DESTDIR}${ICONDIR}
+       ${INSTALL} -d ${DESTDIR}${IDIR}
+       ${INSTALL} -m ${NONBINMODE} ${ICONS} ${DESTDIR}${IDIR}
 
 install: _iconinstall