Commit a7dba356 authored by FRIGN's avatar FRIGN

Fix Makefile+config.mk

I forgot that we can't just cd. It has to be a &&-statement.
Also, uncomplicate the output.
parent 24c4b045
......@@ -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
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment