Updating config.mk, manual and README

diff --git a/README b/README
index f102b7b..3fcff70 100644 (file)
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ XMenu comes with the following features:
 • XMenu reads something in and prints something out, the UNIX way.
 • Submenus (some menu entries can spawn another menu).
 • Separators (menu entries can be separated by a line).
 • XMenu reads something in and prints something out, the UNIX way.
 • Submenus (some menu entries can spawn another menu).
 • Separators (menu entries can be separated by a line).

-• Icons (menu entries can follow by an icon image).
+• Icons (menu entries can be preceded by an icon image).

 
 
 § Files
 
 
 § Files

diff --git a/config.mk b/config.mk
index e2118dd..2844160 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -5,6 +5,9 @@ PROG = xmenu
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 

+LOCALINC = /usr/local/include
+LOCALLIB = /usr/local/lib
+

 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 


@@ -13,8 +16,8 @@ FREETYPEINC = /usr/include/freetype2
 #FREETYPEINC = ${X11INC}/freetype2
 
 # includes and libs
 #FREETYPEINC = ${X11INC}/freetype2
 
 # includes and libs

-INCS = -I/usr/local/include -I${X11INC} -I${FREETYPEINC}
-LIBS = -L/usr/local/lib -L${X11LIB} -lfontconfig -lXft -lX11 -lImlib2
+INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
+LIBS = -L${LOCALLIB} -L${X11LIB} -lfontconfig -lXft -lX11 -lImlib2

 
 # flags
 CPPFLAGS =
 
 # flags
 CPPFLAGS =

diff --git a/xmenu.1 b/xmenu.1
index 1aa2434..bad4aee 100644 (file)
--- a/xmenu.1
+++ b/xmenu.1
@@ -109,7 +109,7 @@ The size in pixels of the border around the menu.
 The size in pixels of the item separator.
 
 .SH EXAMPLES
 The size in pixels of the item separator.
 
 .SH EXAMPLES

-The following is an script exemplifying the use of
+The following script illustrates the use of

 .BR xmenu .
 The output is redirected to
 .IR sh (1),
 .BR xmenu .
 The output is redirected to
 .IR sh (1),


@@ -121,7 +121,7 @@ creating a command to be run by the shell.
 cat <<EOF | xmenu | sh &
 Applications
        IMG:./web.png   Web Browser     firefox
 cat <<EOF | xmenu | sh &
 Applications
        IMG:./web.png   Web Browser     firefox

-       Image editor                            gimp
+       IMG:./gimp.png  Image editor    gimp

 Terminal (xterm)                               xterm
 Terminal (urxvt)                               urxvt
 Terminal (st)                                  st
 Terminal (xterm)                               xterm
 Terminal (urxvt)                               urxvt
 Terminal (st)                                  st


@@ -132,7 +132,7 @@ EOF
 .EE
 .PP
 For example, by selecting \(lqApplications\(rq, a new menu will appear.
 .EE
 .PP
 For example, by selecting \(lqApplications\(rq, a new menu will appear.

-Selecting \(lqWeb Browser\(rq in the new menu will open firefox.
+Selecting \(lqWeb Browser\(rq in the new menu opens firefox.

 .SH SEE ALSO
 .IR dmenu (1),
 .IR 9menu (1),
 .SH SEE ALSO
 .IR dmenu (1),
 .IR 9menu (1),