GopherProxy

	Fix Makefile+config.mk - farbfeld - suckless image format with conversion tools
	git clone git://git.suckless.org/farbfeld
	Log
	Files
	Refs
	README
	LICENSE
	---
	commit a7dba356ecad56b84c06fc12f537682feff61232
	parent 24c4b045fc495becc9ba4239ba3d2963851c7634
	Author: FRIGN <[email protected]>
	Date: Tue, 5 Jan 2016 16:56:47 +0100

	Fix Makefile+config.mk

	I forgot that we can't just cd. It has to be a &&-statement.
	Also, uncomplicate the output.

	Diffstat:
	M Makefile \| 23 ++++++++++-------------
	M config.mk \| 9 +++++----

	2 files changed, 15 insertions(+), 17 deletions(-)
	---
	diff --git a/Makefile b/Makefile
	@@ -17,26 +17,23 @@ all: png2ff ff2png jpg2ff
	clean:
	rm -f ${BIN}

	-install:
	+install: all
	@echo installing into ${DESTDIR}${PREFIX}/bin
	@mkdir -p ${DESTDIR}${PREFIX}/bin
	@cp -f 2ff ${BIN} ${DESTDIR}${PREFIX}/bin
	- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
	+ @echo installing manpages into ${DESTDIR}${MANPREFIX}
	+ @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
	@cp -f $(MAN1) $(DESTDIR)$(MANPREFIX)/man1
	- cd $(DESTDIR)$(MANPREFIX)/man1 && chmod 644 $(MAN1)
	- mkdir -p $(DESTDIR)$(MANPREFIX)/man5
	+ @cd $(DESTDIR)$(MANPREFIX)/man1 && chmod 644 $(MAN1)
	+ @mkdir -p $(DESTDIR)$(MANPREFIX)/man5
	@cp -f $(MAN5) $(DESTDIR)$(MANPREFIX)/man5
	- cd $(DESTDIR)$(MANPREFIX)/man5 && chmod 644 $(MAN5)
	+ @cd $(DESTDIR)$(MANPREFIX)/man5 && chmod 644 $(MAN5)

	uninstall:
	@echo removing from ${DESTDIR}${PREFIX}/bin
	- cd ${DESTDIR}${PREFIX}/bin
	- @rm -f 2ff ${BIN}
	- @echo removing from ${DESTDIR}${MANPREFIX}/man1
	- cd ${DESTDIR}${MANPREFIX}/man1
	- @rm -f $(MAN1)
	- @echo removing from ${DESTDIR}${MANPREFIX}/man5
	- cd ${DESTDIR}${MANPREFIX}/man5
	- @rm -f $(MAN5)
	+ @cd ${DESTDIR}${PREFIX}/bin && rm -f 2ff ${BIN}
	+ @echo removing manpages from ${DESTDIR}${MANPREFIX}
	+ @cd ${DESTDIR}${MANPREFIX}/man1 && rm -f $(MAN1)
	+ @cd ${DESTDIR}${MANPREFIX}/man5 && rm -f $(MAN5)

	.PHONY: all clean install uninstall
	diff --git a/config.mk b/config.mk
	@@ -2,15 +2,16 @@

	# paths
	PREFIX = /usr/local
	+MANPREFIX = $(PREFIX)/share/man

	PNGLIB = /usr/local/lib
	PNGINC = /usr/local/include

	-JPEGLIB = /usr/local/lib
	-JPEGINC = /usr/local/include
	+JPGLIB = /usr/local/lib
	+JPGINC = /usr/local/include

	-INCS = -I${PNGINC} -I${JPEGINC}
	-LIBS = -L${PNGLIB} -L${JPEGLIB} -lpng -ljpeg
	+INCS = -I${PNGINC} -I${JPGINC}
	+LIBS = -L${PNGLIB} -L${JPGLIB} -lpng -ljpeg

	# flags
	CPPFLAGS = -D_DEFAULT_SOURCE