aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Dieter Plaetinck <dieter@plaetinck.be>2010-08-25 16:39:55 +0200
committerGravatar Dieter Plaetinck <dieter@plaetinck.be>2010-08-25 16:39:55 +0200
commita6e1036ca8ba8d2239bfc0d121a56201e322b781 (patch)
tree9dd34e6be06882fea4a66d375b45945018b02c8e
parentf0fb038c495e9a87b8724e273714dcecee5459c1 (diff)
parentf7c6469ee19aa8838cbc5dc9d804929b3ae3d61f (diff)
Merge remote branch 'pawelz/gnuism'
-rw-r--r--Makefile37
1 files changed, 23 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index a995f76..b922264 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,10 @@ strip:
install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
-install-uzbl-core: all
+install-dirs:
+ [ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin
+
+install-uzbl-core: all install-dirs
install -d $(INSTALLDIR)/share/uzbl/
install -d $(DOCDIR)
install -m644 docs/* $(DOCDIR)/
@@ -96,21 +99,27 @@ install-uzbl-core: all
install -m644 AUTHORS $(DOCDIR)/
cp -r examples $(INSTALLDIR)/share/uzbl/
chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
- sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
- install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-
-install-uzbl-browser:
- install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
- install -D -m755 examples/data/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
- install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
- sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
- sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
-
-install-uzbl-tabbed:
- install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+ mv $(INSTALLDIR)/share/uzbl/examples/config/config{,.bak}
+ sed 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config
+ rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak
+ install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+
+install-uzbl-browser: install-dirs
+ install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+ install -m755 examples/data/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
+ install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ mv $(INSTALLDIR)/bin/uzbl-browser{,.bak}
+ sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < $(INSTALLDIR)/bin/uzbl-browser.bak > $(INSTALLDIR)/bin/uzbl-browser
+ rm $(INSTALLDIR)/bin/uzbl-browser.bak
+ mv $(INSTALLDIR)/bin/uzbl-event-manager{,.bak}
+ sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < $(INSTALLDIR)/bin/uzbl-event-manager.bak > $(INSTALLDIR)/bin/uzbl-event-manager
+ rm $(INSTALLDIR)/bin/uzbl-event-manager.bak
+
+install-uzbl-tabbed: install-dirs
+ install -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
# you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors
-install-example-data:
+install-example-data: install-dirs
install -d $(DESTDIR)/home/.config/uzbl
install -d $(DESTDIR)/home/.cache/uzbl
install -d $(DESTDIR)/home/.local/share/uzbl