X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=INSTALL;h=7d1df65482d8d362bfcb55ca8bdce4f895005c4c;hb=c30f6c3f41b5167c4de5839b0fa53fdb11b4e871;hp=d7fe13bba188a236d8f6f9bcd75d656416f99066;hpb=869f3d664de8a44b97de9f8e7432e008ac65d0fb;p=xournal.git

diff --git a/INSTALL b/INSTALL
index d7fe13b..7d1df65 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,23 +1,6 @@
 Xournal Installation instructions
 =================================
 
-Binary installer:
------------------
-
-The tarball includes an executable file for Linux IA32.  If your setup
-is sufficiently standard, you might be able to use the binary installer
-script, "install-binary".
-
-Either run this script as root, to install xournal in /usr/local/bin
-(and the dependencies in /usr/local/share/xournal), or as any user, to
-install xournal in your home directory.
-
-You will still need to have gtk+ 2.4 or later and the other required
-libraries installed on your system (see below).
-
-Otherwise, read on for compilation and installation instructions.
-
-
 Dependencies:
 -------------
 
@@ -26,25 +9,24 @@ Required packages and libraries:
 * TO COMPILE xournal:
 
 - autoconf, automake  (to generate the makefiles)
-- gtk+ 2.4 or later development packages  (2.6 recommended)
+- gtk+ 2.10 or later development packages
    (package gtk2-devel and its dependencies)
 - libgnomecanvas 2.4 or later development packages 
    (package libgnomecanvas-devel and its dependencies)
-- libgnomeprint and libgnomeprintui 2.2 development packages
-   (packages libgnomeprint22-devel, libgnomeprintui22-devel, and dependencies)
+- poppler-glib 0.5.4 or later development packages
+   (package poppler-glib-devel and dependencies)
 
 * TO RUN xournal:
 
-- gtk+ 2.4 or later (2.6 recommended)
+- gtk+ 2.10 or later
    (package gtk2 and dependencies)
 - libgnomecanvas 2.4 or later
    (package libgnomecanvas and dependencies)
-- libgnomeprint and libgnomeprintui 2.2 or later 
-    (packages libgnomeprint22, libgnomeprintui22, and dependencies)
+- poppler-glib 0.5.4 or later
+   (package poppler-glib and dependencies)
 
 * OTHER:
 
-- xpdf (more precisely, pdftoppm) is required for PDF file annotation
 - ghostscript (optional: used to import PS/PDF files as bitmap backgrounds)
 
 
@@ -53,14 +35,14 @@ Compilation and installation:
 
 Installation in /usr/local:
 
-./autogen.sh
+./configure
 make
 (as root) make install
-
+(as root) make desktop-install
 
 Installation in $HOME:
 
-./autogen.sh
 ./configure --prefix=$HOME
 make
 make install
+make home-desktop-install