[hackers] [farbfeld] Fix Makefile+config.mk || FRIGN

From: <git_AT_suckless.org>
Date: Tue, 5 Jan 2016 16:57:22 +0100 (CET)

commit a7dba356ecad56b84c06fc12f537682feff61232
Author: FRIGN <dev_AT_frign.de>
AuthorDate: Tue Jan 5 16:56:47 2016 +0100
Commit: FRIGN <dev_AT_frign.de>
CommitDate: Tue Jan 5 16:56:47 2016 +0100

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

diff --git a/Makefile b/Makefile
index b93b472..cfc4fe8 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -17,26 +17,23 @@ all: png2ff ff2png jpg2ff
 clean:
         rm -f ${BIN}
 
-install:
+install: all
         _AT_echo installing into ${DESTDIR}${PREFIX}/bin
         _AT_mkdir -p ${DESTDIR}${PREFIX}/bin
         _AT_cp -f 2ff ${BIN} ${DESTDIR}${PREFIX}/bin
- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+ _AT_echo installing manpages into ${DESTDIR}${MANPREFIX}
+ _AT_mkdir -p $(DESTDIR)$(MANPREFIX)/man1
         _AT_cp -f $(MAN1) $(DESTDIR)$(MANPREFIX)/man1
- cd $(DESTDIR)$(MANPREFIX)/man1 && chmod 644 $(MAN1)
- mkdir -p $(DESTDIR)$(MANPREFIX)/man5
+ _AT_cd $(DESTDIR)$(MANPREFIX)/man1 && chmod 644 $(MAN1)
+ _AT_mkdir -p $(DESTDIR)$(MANPREFIX)/man5
         _AT_cp -f $(MAN5) $(DESTDIR)$(MANPREFIX)/man5
- cd $(DESTDIR)$(MANPREFIX)/man5 && chmod 644 $(MAN5)
+ _AT_cd $(DESTDIR)$(MANPREFIX)/man5 && chmod 644 $(MAN5)
 
 uninstall:
         _AT_echo removing from ${DESTDIR}${PREFIX}/bin
- cd ${DESTDIR}${PREFIX}/bin
- _AT_rm -f 2ff ${BIN}
- _AT_echo removing from ${DESTDIR}${MANPREFIX}/man1
- cd ${DESTDIR}${MANPREFIX}/man1
- _AT_rm -f $(MAN1)
- _AT_echo removing from ${DESTDIR}${MANPREFIX}/man5
- cd ${DESTDIR}${MANPREFIX}/man5
- _AT_rm -f $(MAN5)
+ _AT_cd ${DESTDIR}${PREFIX}/bin && rm -f 2ff ${BIN}
+ _AT_echo removing manpages from ${DESTDIR}${MANPREFIX}
+ _AT_cd ${DESTDIR}${MANPREFIX}/man1 && rm -f $(MAN1)
+ _AT_cd ${DESTDIR}${MANPREFIX}/man5 && rm -f $(MAN5)
 
 .PHONY: all clean install uninstall
diff --git a/config.mk b/config.mk
index 6c04982..9d01b31 100644
--- a/config.mk
+++ b/config.mk
_AT_@ -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
Received on Tue Jan 05 2016 - 16:57:22 CET