[Pkg-wmaker-commits] [wmbattery] 09/241: * Use /usr/share/icons/wmbattery, not /usr/X11R6/share. Sheesh.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 393809cfc9d85085e23b8b8ab0fcff38b3adb431
Author: joey <joey at a4a2c43b-8ac3-0310-8836-e0e880c912e2>
Date:   Thu Apr 6 20:19:43 2000 +0000

       * Use /usr/share/icons/wmbattery, not /usr/X11R6/share. Sheesh.
---
 Makefile         | 11 ++++++-----
 debian/changelog |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0b29c35..062caea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 ICONDIR = /usr/share/icons/wmbattery
 BINDIR  = /usr/X11R6/bin
 MANDIR  = /usr/X11R6/man/man1
+INCDIR  = -I/usr/X11R6/include
 LIBDIR  = -L/usr/X11R6/lib
 LIBS    = -lXpm -lXext
-CFLAGS  = -g -DICONDIR=\"$(ICONDIR)\" -O2 -Wall
+CFLAGS  = $(INCDIR) -g -DICONDIR=\"$(ICONDIR)\" -O2 -Wall
 
 wmbattery: wmbattery.c wmbattery.h
 	$(CC) $(CFLAGS) $(LIBDIR) $(LIBS) wmbattery.c -o wmbattery
@@ -12,10 +13,10 @@ clean:
 	rm -f wmbattery
 
 install: wmbattery
-	install -d $(PREFIX)/$(ICONDIR) $(PREFIX)/$(BINDIR) $(PREFIX)/$(MANDIR)
-	install -s wmbattery $(PREFIX)/$(BINDIR)
-	install -m 644 wmbattery.1 $(PREFIX)/$(MANDIR)
-	install -m 644 *.xpm $(PREFIX)/$(ICONDIR)
+	install -c -d $(PREFIX)$(ICONDIR) $(PREFIX)$(BINDIR) $(PREFIX)$(MANDIR)
+	install -c -s wmbattery $(PREFIX)$(BINDIR)
+	install -c -m 644 wmbattery.1x $(PREFIX)$(MANDIR)/wmbattery.1
+	install -c -m 644 *.xpm $(PREFIX)$(ICONDIR)
 
 test: wmbattery
 	./wmbattery
diff --git a/debian/changelog b/debian/changelog
index c1e242a..c84b1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmbattery (1.12) unstable; urgency=low
+
+  * Use /usr/share/icons/wmbattery, not /usr/X11R6/share. Sheesh. 
+
+ -- Joey Hess <joeyh at debian.org>  Thu,  6 Apr 2000 13:16:52 -0700
+
 wmbattery (1.11) unstable; urgency=low
 
   * Build deps.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git