diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2009-12-06 17:33:40 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2009-12-06 17:33:40 +0800 |
| commit | ae6e4f8f9c7aec98d2a8291e602a6c491825d814 (patch) | |
| tree | cbd39d0aee8cd5ec5cf87f065de7b10cace16e28 | |
| parent | 3d2043d8f46855e8c3724e65bd5848c06ed27069 (diff) | |
| parent | 0f13fe9e6b71347f67f8374ce0aa7164648e8e51 (diff) | |
Merge branch 'master' of git://github.com/Dieterbe/uzbl
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/INSTALL | 13 |
2 files changed, 8 insertions, 7 deletions
@@ -96,6 +96,7 @@ install-uzbl-core: all install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs install -m644 README $(INSTALLDIR)/share/uzbl/docs + sed -i 's#^set prefix.*=.*#set prefix = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config install-uzbl-browser: all install -d $(INSTALLDIR)/bin @@ -104,7 +105,6 @@ install-uzbl-browser: all install -m755 examples/data/uzbl/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager sed -i 's#^PREFIX=.*#PREFIX=$(PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser sed -i "s#^PREFIX = .*#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager - sed -i 's#^set prefix.*=.*#set prefix = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config install-uzbl-tabbed: all install -d $(INSTALLDIR)/bin diff --git a/docs/INSTALL b/docs/INSTALL index ca5a5b1..711ea97 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -1,11 +1,8 @@ Packages -------- -[Arch Linux](http://www.archlinux.org) is our distro of choice, and the distro we use for testing. - -You can find [PKGBUILDS](http://aur.archlinux.org/packages.php?K=uzbl) on the AUR -for all subprojects and for both the master and experimental branches. - -For other distros, see [uzbl.org/wiki/howtos](http://www.uzbl.org/wiki/howtos) +Uzbl is available through the package managers of Arch, Gentoo, Debian, +Ubuntu and more. If you cannot find a package for your system you may find +a tutorial on [uzbl.org/wiki/howtos](http://www.uzbl.org/wiki/howtos) From source ----------- @@ -43,6 +40,10 @@ Dependencies which are optional for uzbl-core are marked with an asterisk. (i.e. * python [*] * perl (formfiller.pl) [*] * xclip [*] +* pango [*] +* pygtk [*] +* pygobject [*] +* python-simplejson [*] Make dependencies ----------------- |