jer         14/05/12 17:42:27

  Added:                xbattbar-1.4.5.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.1                  x11-misc/xbattbar/files/xbattbar-1.4.5.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xbattbar/files/xbattbar-1.4.5.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xbattbar/files/xbattbar-1.4.5.patch?rev=1.1&content-type=text/plain

Index: xbattbar-1.4.5.patch
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,16 @@
 all: $(TARGET) $(APM_CHECK)
 
 $(TARGET): obj/xbattbar.o
-       gcc -o $@ $< -lX11 $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
 
 obj/xbattbar.o: xbattbar.c obj/stamp
-       gcc -MMD -o $@ -c $< $(CFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
 
 $(APM_CHECK): obj/xbattbar-check-apm.o
-       gcc -o $@ $< $(LDFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
-       gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
 
 obj/stamp:
        mkdir obj
@@ -32,12 +32,12 @@
 
 
 install: $(TARGET) $(APM_CHECK)
-       install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
+       install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
        install -d -m 0755 $(DESTDIR)/usr/bin
        install -d -m 0755 $(DESTDIR)/usr/share/man/man1
-       install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
-       install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
-       install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/lib/$(PROJECT)/
+       install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+       install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+       install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
        install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
        install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
 




Reply via email to