X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=af56a199a75b4306d7d04251ecf5a94a04840f2c;hb=beaaf4c742036e0f02fa9867e4cd44b13faac5a2;hp=70d37281034ee74aa35f8003e14f7b523f367bad;hpb=aabac78fd0c5fa0ef3ec46080acc788a32a1ef9c;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 70d3728..af56a19 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ CFLAGS+=$(EXTRA_CFLAGS)
 
 # Fallback for libyajl 1 which did not include yajl_version.h. We need
 # YAJL_MAJOR from that file to decide which code path should be used.
-CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
+CFLAGS += -idirafter yajl-fallback
 
 OBJS:=$(wildcard src/*.c *.c)
 OBJS:=$(OBJS:.c=.o)
@@ -66,7 +66,7 @@ clean:
 	rm -f *.o src/*.o
 
 distclean: clean
-	rm -f i3status
+	rm -f i3status man/i3status.1
 
 manpage:
 	$(MAKE) -C man
@@ -84,12 +84,14 @@ install:
 release:
 	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
 	mkdir i3status-${VERSION}
-	find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "Makefile" -or -name "LICENSE" \) -exec cp '{}' i3status-${VERSION} \;
+	find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "Makefile" -or -name "LICENSE" -or -name "CHANGELOG" \) -exec cp '{}' i3status-${VERSION} \;
 	mkdir i3status-${VERSION}/src
 	mkdir i3status-${VERSION}/man
 	find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;
 	find man -maxdepth 1 -type f \( -regex ".*\.\(1\|man\|conf\)" -or -name "Makefile" \) -exec cp '{}' i3status-${VERSION}/man \;
 	cp -r include i3status-${VERSION}
+	cp -r yajl-fallback i3status-${VERSION}
+	cp -r contrib i3status-${VERSION}
 	sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
 	tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
 	rm -rf i3status-${VERSION}