Redirect stdout to correct file.

[stagit.git] / Makefile

diff --git a/Makefile b/Makefile
index 3983744825c3ab794fc7b4f15fc222bde2660404..1b2750e4b1351957a3971d04862f2817e99a1a6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,21 @@
-include config.mk
+.POSIX:
 
 NAME = stagit
-VERSION = 0.7
+VERSION = 0.9.3
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+
+LIBGIT_INC = -I/usr/local/include
+LIBGIT_LIB = -L/usr/local/lib -lgit2
+
+# use system flags.
+STAGIT_CFLAGS = ${LIBGIT_INC} ${CFLAGS}
+STAGIT_LDFLAGS = ${LIBGIT_LIB} ${LDFLAGS}
+STAGIT_CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE
+
 SRC = \
        stagit.c\
        stagit-index.c
@@ -10,8 +24,8 @@ COMPATSRC = \
        strlcat.c\
        strlcpy.c
 BIN = \
-       stagit\
-       stagit-index
+       stagit.out\
+       stagit-index.out
 MAN1 = \
        stagit.1\
        stagit-index.1
@@ -30,16 +44,16 @@ OBJ = ${SRC:.c=.o} ${COMPATOBJ}
 all: ${BIN}
 
 .o:
-       ${CC} ${LDFLAGS} -o $@ ${LIBS}
+       ${CC} -o $@ ${LDFLAGS}
 
 .c.o:
-       ${CC} -c ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
+       ${CC} -o $@ -c $< ${STAGIT_CFLAGS} ${STAGIT_CPPFLAGS}
 
 dist:
        rm -rf ${NAME}-${VERSION}
        mkdir -p ${NAME}-${VERSION}
        cp -f ${MAN1} ${HDR} ${SRC} ${COMPATSRC} ${DOC} \
-               Makefile config.mk favicon.png logo.png style.css \
+               Makefile favicon.png logo.png style.css \
                example_create.sh example_post-receive.sh \
                ${NAME}-${VERSION}
        # make tarball
@@ -47,13 +61,14 @@ dist:
                gzip -c > ${NAME}-${VERSION}.tar.gz
        rm -rf ${NAME}-${VERSION}
 
-${OBJ}: config.mk ${HDR}
+${OBJ}: ${HDR}
 
-stagit: stagit.o ${COMPATOBJ}
-       ${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS}
+stagit.out: stagit.o ${COMPATOBJ} Gemfile
+       bundle install
+       ${CC} -o $@ stagit.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
-stagit-index: stagit-index.o ${COMPATOBJ}
-       ${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS}
+stagit-index.out: stagit-index.o ${COMPATOBJ}
+       ${CC} -o $@ stagit-index.o ${COMPATOBJ} ${STAGIT_LDFLAGS}
 
 clean:
        rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
@@ -64,14 +79,14 @@ install: all
        cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
        for f in ${BIN}; do chmod 755 ${DESTDIR}${PREFIX}/bin/$$f; done
        # installing example files.
-       mkdir -p ${DESTDIR}${PREFIX}/share/${NAME}
+       mkdir -p ${DESTDIR}${DOCPREFIX}
        cp -f style.css\
                favicon.png\
                logo.png\
                example_create.sh\
                example_post-receive.sh\
                README\
-               ${DESTDIR}${PREFIX}/share/${NAME}
+               ${DESTDIR}${DOCPREFIX}
        # installing manual pages.
        mkdir -p ${DESTDIR}${MANPREFIX}/man1
        cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
@@ -82,13 +97,13 @@ uninstall:
        for f in ${BIN}; do rm -f ${DESTDIR}${PREFIX}/bin/$$f; done
        # removing example files.
        rm -f \
-               ${DESTDIR}${PREFIX}/share/${NAME}/style.css\
-               ${DESTDIR}${PREFIX}/share/${NAME}/favicon.png\
-               ${DESTDIR}${PREFIX}/share/${NAME}/logo.png\
-               ${DESTDIR}${PREFIX}/share/${NAME}/example_create.sh\
-               ${DESTDIR}${PREFIX}/share/${NAME}/example_post-receive.sh\
-               ${DESTDIR}${PREFIX}/share/${NAME}/README
-       -rmdir ${DESTDIR}${PREFIX}/share/${NAME}
+               ${DESTDIR}${DOCPREFIX}/style.css\
+               ${DESTDIR}${DOCPREFIX}/favicon.png\
+               ${DESTDIR}${DOCPREFIX}/logo.png\
+               ${DESTDIR}${DOCPREFIX}/example_create.sh\
+               ${DESTDIR}${DOCPREFIX}/example_post-receive.sh\
+               ${DESTDIR}${DOCPREFIX}/README
+       -rmdir ${DESTDIR}${DOCPREFIX}
        # removing manual pages.
        for m in ${MAN1}; do rm -f ${DESTDIR}${MANPREFIX}/man1/$$m; done