Merge branch 'master' into type

This commit is contained in:
phillbush 2021-01-08 18:39:28 -03:00
commit 0783fd073c
2 changed files with 4 additions and 1 deletions

View File

@ -47,7 +47,7 @@ The files are:
First, edit `./config.mk` to match your local setup. First, edit `./config.mk` to match your local setup.
In order to build XMenu you need the `Imlib2`, `Xlib` and `Xft` header files. In order to build XMenu you need the `Imlib2`, `Xlib`, `Xinerama` and `Xft` header files.
The default configuration for XMenu is specified in the file `config.h`, The default configuration for XMenu is specified in the file `config.h`,
you can edit it, but most configuration can be changed at runtime via you can edit it, but most configuration can be changed at runtime via
X resources. Enter the following command to build XMenu. This command X resources. Enter the following command to build XMenu. This command

View File

@ -8,6 +8,9 @@ MANPREFIX ?= ${PREFIX}/share/man
LOCALINC ?= /usr/local/include LOCALINC ?= /usr/local/include
LOCALLIB ?= /usr/local/lib LOCALLIB ?= /usr/local/lib
# SHELL variable (mainly for non-GNU make)
SHELL ?= /bin/sh
X11INC ?= /usr/X11R6/include X11INC ?= /usr/X11R6/include
X11LIB ?= /usr/X11R6/lib X11LIB ?= /usr/X11R6/lib