-diff -aurN fbpanel-4.1.orig/config/Makefile fbpanel-4.1/config/Makefile
---- fbpanel-4.1.orig/config/Makefile 2004-04-23 03:20:51.000000000 +0200
-+++ fbpanel-4.1/config/Makefile 2005-05-02 19:05:40.000000000 +0200
-@@ -18,11 +18,11 @@
- $(RM) $(RES) *~
+diff -aurN fbpanel-4.3.orig/config/default.cfg fbpanel-4.3/config/default.cfg
+--- fbpanel-4.3.orig/config/default.cfg 2005-05-21 17:44:18.000000000 +0200
++++ fbpanel-4.3/config/default.cfg 2006-08-20 12:51:02.000000000 +0200
+@@ -50,7 +50,7 @@
+
+ # # Identify panel window type as dock
+ # # legal values are boolean
+-# SetDockTpe = true
++# SetDockType = true
+
+ # # Reserve panel's space so that it will not be covered by maximazied windows
+ # # legal values are boolean
+@@ -126,11 +126,11 @@
+ type = menu
+ config {
+ # name = menu
+- image = PREFIX/share/fbpanel/images/Menu.png
++ image = /usr/share/fbpanel/images/Menu.png
+
+ menu {
+ name = Networking
+- image = PREFIX/share/fbpanel/images/Networking.png
++ image = /usr/share/fbpanel/images/Networking.png
+ item {
+ # image =
+ name = mozilla
+@@ -147,19 +147,19 @@
+ }
+ item {
+ name = Configure
+- image = PREFIX/share/fbpanel/images/settings.png
++ image = /usr/share/fbpanel/images/settings.png
+ command = configure
+ }
+ separator {
+ }
+ item {
+ name = terminal
+- image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
++ image = /usr/share/fbpanel/images/GNOME-Terminal.png
+ action = xterm
+ }
+ item {
+ name = emacs
+- image = PREFIX/share/fbpanel/images/Emacs.png
++ image = /usr/share/fbpanel/images/Emacs.png
+ action = emacs
+ }
+
+@@ -176,12 +176,12 @@
+ type = launchbar
+ config {
+ button {
+- image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
++ image = /usr/share/fbpanel/images/GNOME-Terminal.png
+ tooltip = Terminal
+ action = xterm
+ }
+ button {
+- image = PREFIX/share/fbpanel/images/Emacs.png
++ image = /usr/share/fbpanel/images/Emacs.png
+ tooltip = Emacs
+ action = emacs
+ }
+@@ -203,21 +203,21 @@
+ Plugin {
+ type = icons
+ config {
+- DefaultIcon = PREFIX/share/fbpanel/images/default.xpm
++ DefaultIcon = /usr/share/fbpanel/images/default.xpm
+ application {
+- Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
++ Image = /usr/share/fbpanel/images/GNOME-Terminal.png
+ ClassName = XTerm
+ }
+ application {
+- Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
++ Image = /usr/share/fbpanel/images/GNOME-Terminal.png
+ ClassName = mlterm
+ }
+ application {
+- Image = PREFIX/share/fbpanel/images/GNOME-Terminal.png
++ Image = /usr/share/fbpanel/images/GNOME-Terminal.png
+ ClassName = URxvt
+ }
+ application {
+- Image = PREFIX/share/fbpanel/images/Emacs.png
++ Image = /usr/share/fbpanel/images/Emacs.png
+ AppName = emacs
+ ClassName = Emacs
+ }
+diff -aurN fbpanel-4.3.orig/config/Makefile fbpanel-4.3/config/Makefile
+--- fbpanel-4.3.orig/config/Makefile 2005-05-22 02:46:13.000000000 +0200
++++ fbpanel-4.3/config/Makefile 2006-08-20 12:52:23.000000000 +0200
+@@ -17,11 +17,12 @@
+
install:
- install -d $(PREFIX)/share/fbpanel
-- install -m 644 $(RES) $(PREFIX)/share/fbpanel
+- install -m 644 $(TARGET) $(PREFIX)/share/fbpanel
- install -d $(PREFIX)/share/fbpanel/images
- install -m 644 images/*.png $(PREFIX)/share/fbpanel/images
- install -m 644 images/*.xpm $(PREFIX)/share/fbpanel/images
-+ install -d $(DESTDIR)$(PREFIX)/share/fbpanel
-+ install -m 644 $(RES) $(DESTDIR)$(PREFIX)/share/fbpanel
-+ install -d $(DESTDIR)$(PREFIX)/share/fbpanel/images
-+ install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/fbpanel/images
-+ install -m 644 images/*.xpm $(DESTDIR)$(PREFIX)/share/fbpanel/images
-
++ install -d $(DESTDIR)/etc/fbpanel
++ install -m 644 $(TARGET) $(DESTDIR)/etc/fbpanel
++ install -d $(DESTDIR)$(DATADIR)/fbpanel
++ install -d $(DESTDIR)$(DATADIR)/fbpanel/images
++ install -m 644 images/*.png $(DESTDIR)$(DATADIR)/fbpanel/images
++ install -m 644 images/*.xpm $(DESTDIR)$(DATADIR)/fbpanel/images
+
uninstall:
- rm -rf $(PREFIX)/share/fbpanel
-diff -aurN fbpanel-4.1.orig/Makefile fbpanel-4.1/Makefile
---- fbpanel-4.1.orig/Makefile 2004-12-18 20:31:59.000000000 +0100
-+++ fbpanel-4.1/Makefile 2005-05-02 19:05:40.000000000 +0200
-@@ -55,8 +55,8 @@
- rm -f Makefile.config config.h
+- $(RM) -r $(PREFIX)/share/fbpanel/images/
++ $(RM) -r $(DATADIR)/fbpanel/images/
+diff -aurN fbpanel-4.3.orig/Makefile fbpanel-4.3/Makefile
+--- fbpanel-4.3.orig/Makefile 2005-05-31 16:55:50.000000000 +0200
++++ fbpanel-4.3/Makefile 2006-08-20 12:48:23.000000000 +0200
+@@ -48,8 +48,8 @@
+ $(RM) Makefile.config config.h
install:
- install -d $(PREFIX)/bin
+ install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
uninstall:
- rm -f $(PREFIX)/bin/$(TARGET)
-diff -aurN fbpanel-4.1.orig/Makefile.common fbpanel-4.1/Makefile.common
---- fbpanel-4.1.orig/Makefile.common 2004-11-06 00:36:35.000000000 +0100
-+++ fbpanel-4.1/Makefile.common 2005-05-02 19:05:40.000000000 +0200
-@@ -20,7 +20,7 @@
- INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
- INCS := $(INCS2:-I%=-isystem%)
- # first = may be overwriten by command line or env. variable
+ $(RM) $(PREFIX)/bin/$(TARGET)
+diff -aurN fbpanel-4.3.orig/Makefile.common fbpanel-4.3/Makefile.common
+--- fbpanel-4.3.orig/Makefile.common 2005-05-31 17:39:18.000000000 +0200
++++ fbpanel-4.3/Makefile.common 2006-08-20 12:48:57.000000000 +0200
+@@ -85,11 +85,13 @@
+ RM = rm -f
+ CC = gcc
+ AR = ar
+-LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu
++LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lXmu
+ INCS2 = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
+ INCS := $(INCS2:-I%=-isystem %)
+
-CFLAGS = -O2
++LDFLAGS += -Wl,-export-dynamic
++
+CFLAGS = $(OPTFLAGS)
- # this one always applays
- CFLAGS += -Wall
- ifneq (,$(DEVEL))
-diff -aurN fbpanel-4.1.orig/man/Makefile fbpanel-4.1/man/Makefile
---- fbpanel-4.1.orig/man/Makefile 2004-03-31 12:31:11.000000000 +0200
-+++ fbpanel-4.1/man/Makefile 2005-05-02 19:05:40.000000000 +0200
-@@ -20,8 +20,8 @@
+ ifeq (1,$(DEVEL))
+ override CFLAGS += -g
+ endif
+diff -aurN fbpanel-4.3.orig/man/Makefile fbpanel-4.3/man/Makefile
+--- fbpanel-4.3.orig/man/Makefile 2005-05-22 02:51:08.000000000 +0200
++++ fbpanel-4.3/man/Makefile 2006-08-20 12:52:45.000000000 +0200
+@@ -17,8 +17,8 @@
install: all
- install -d $(PREFIX)/share/man/man1
- install -m 644 $(TARGET) $(PREFIX)/share/man/man1
-+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
-+ install -m 644 $(TARGET) $(DESTDIR)$(PREFIX)/share/man/man1
++ install -d $(DESTDIR)$(DATADIR)/man/man1
++ install -m 644 $(TARGET) $(DESTDIR)$(DATADIR)/man/man1
uninstall:
- rm -f $(PREFIX)/share/man/man1/$(TARGET)
-diff -aurN fbpanel-4.1.orig/plugins/Makefile fbpanel-4.1/plugins/Makefile
---- fbpanel-4.1.orig/plugins/Makefile 2004-12-16 12:47:42.000000000 +0100
-+++ fbpanel-4.1/plugins/Makefile 2005-05-02 19:39:48.000000000 +0200
-@@ -43,9 +43,9 @@
- $(RM) *.dep *.so *.o *~
+- $(RM) $(PREFIX)/share/man/man1/$(TARGET)
++ $(RM) $(DATADIR)/man/man1/$(TARGET)
+diff -aurN fbpanel-4.3.orig/plugins/Makefile fbpanel-4.3/plugins/Makefile
+--- fbpanel-4.3.orig/plugins/Makefile 2005-05-31 17:45:06.000000000 +0200
++++ fbpanel-4.3/plugins/Makefile 2006-08-20 12:48:23.000000000 +0200
+@@ -47,8 +47,8 @@
+ ifeq (0,$(STATIC_PLUGINS))
install:
- install -d $(PREFIX)/share/fbpanel/plugins
- install -m 644 $(SOBJ) $(PREFIX)/share/fbpanel/plugins
-+ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
++ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
+ install -m 644 $(SOBJ) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
uninstall:
-- echo rm -rf $(PREFIX)/share/fbpanel/plugins/
-+ echo rm -rf $(LIBDIR)/fbpanel/plugins/
-
-diff -aurN fbpanel-4.1.orig/systray/Makefile fbpanel-4.1/systray/Makefile
---- fbpanel-4.1.orig/systray/Makefile 2004-11-06 01:08:52.000000000 +0100
-+++ fbpanel-4.1/systray/Makefile 2005-05-02 19:37:41.000000000 +0200
-@@ -34,9 +34,9 @@
-
+ $(RM) -r $(PREFIX)/share/fbpanel/plugins/
+diff -aurN fbpanel-4.3.orig/systray/Makefile fbpanel-4.3/systray/Makefile
+--- fbpanel-4.3.orig/systray/Makefile 2005-05-31 17:31:27.000000000 +0200
++++ fbpanel-4.3/systray/Makefile 2006-08-20 12:48:23.000000000 +0200
+@@ -41,8 +41,8 @@
+ ifeq (0,$(STATIC_PLUGINS))
install:
- install -d $(PREFIX)/share/fbpanel/plugins
- install -m 644 $(TARGET) $(PREFIX)/share/fbpanel/plugins
-+ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
++ install -d $(DESTDIR)$(LIBDIR)/fbpanel/plugins
+ install -m 644 $(TARGET) $(DESTDIR)$(LIBDIR)/fbpanel/plugins
uninstall:
-- echo rm -rf $(PREFIX)/share/fbpanel/plugins/
-+ echo rm -rf $(LIBDIR)/fbpanel/plugins/
-
+ $(RM) $(PREFIX)/share/fbpanel/plugins/$(TARGET)
projects / packages / fbpanel.git / blobdiff