diff options
Diffstat (limited to 'x11/wbar/files/patch-Makefile')
| -rw-r--r-- | x11/wbar/files/patch-Makefile | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/x11/wbar/files/patch-Makefile b/x11/wbar/files/patch-Makefile index 75619953fcc6..831dafa29860 100644 --- a/x11/wbar/files/patch-Makefile +++ b/x11/wbar/files/patch-Makefile @@ -1,46 +1,42 @@ ---- Makefile 2007-08-04 03:38:23.000000000 +0200 -+++ Makefile.port 2007-08-18 18:22:32.000000000 +0200 -@@ -1,7 +1,8 @@ +--- Makefile 2007-09-26 18:24:10.000000000 +0200 ++++ Makefile.port 2007-09-28 10:45:10.000000000 +0200 +@@ -1,7 +1,7 @@ TARGET=wbar -CXXFLAGS=`imlib2-config --cflags` -Wall -O2 #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER -LDFLAGS=`imlib2-config --libs` -Wl,-O2 -PREFIX=/usr/share/wbar -+CXXFLAGS=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER -+LDFLAGS=`imlib2-config --libs` -Wl ++CXXFLAGS+=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER ++LDFLAGS+=`imlib2-config --libs` -Wl +PREFIX=%%DATADIR%% -+ICONPACKDIR=$(PREFIX)/iconpack sources= XWin.cc Icon.cc Bar.cc IconLoader.cc \ -@@ -14,7 +15,7 @@ +@@ -14,7 +14,7 @@ $(objects): $(headers) Makefile $(TARGET): $(objects) - g++ $(LDFLAGS) -o $(@) $(objects) -+ ${CXX} $(LDFLAGS) -o $(@) $(objects) ++ $(CXX) $(LDFLAGS) -o $(@) $(objects) #strip $(@) install: $(TARGET) -@@ -26,13 +27,13 @@ +@@ -26,13 +26,13 @@ install -d $(PREFIX) awk '{if($$1 ~ /i:/ || ($$1 ~ /t:/ && NR<4)) print $$1" $(PREFIX)/"$$2; else print $$0;}' \ ./dot.wbar > $(PREFIX)/dot.wbar - cp -a ./iconpack $(PREFIX)/iconpack -+ cp -pLR ./iconpack $(PREFIX) - -- ln -s -t $(PREFIX)/iconpack/wbar.nuvoux ../comic.ttf font.ttf -- ln -s -t $(PREFIX)/iconpack/wbar.ice ../comic.ttf font.ttf -- ln -s -t $(PREFIX)/iconpack/wbar.osx ../comic.ttf font.ttf -+ ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.nuvoux/font.ttf -+ ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.ice/font.ttf -+ ln -s $(ICONPACKDIR)/comic.ttf $(ICONPACKDIR)/wbar.osx/font.ttf ++ cp -pLR ./iconpack $(PREFIX)/iconpack + + #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.nuvoux/font.ttf + #ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.ice/font.ttf + ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf - install ./wbar /usr/bin + install ./wbar %%PREFIX%%/bin uninstall: if [ "`whoami`" != "root" ]; then \ -@@ -41,7 +42,7 @@ +@@ -41,7 +41,7 @@ fi rm -rf $(PREFIX) |