diff options
| author | John C. Vernaleo <jcv@conformal.com> | 2014-07-01 16:09:52 -0400 |
|---|---|---|
| committer | John C. Vernaleo <jcv@conformal.com> | 2014-07-01 16:09:52 -0400 |
| commit | 3f2826210b1128657d474926f52f5f097d706bf2 (patch) | |
| tree | 0291f8af306103c3ac72f0c1115f736ac2c8fc56 /linux | |
| parent | bf6ffda86a0ae6813f32e2b9e1084dd1c4761828 (diff) | |
| download | xombrero-3f2826210b1128657d474926f52f5f097d706bf2.tar.gz | |
Set DXT_DS_RESOURCE_DIR as RESDIR in Makefile.
This removes the hardcoded path for it on all platforms. Provided by Unit193 on irc (and initially suggested by @jrib on github).
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/GNUmakefile | 1 | ||||
| -rw-r--r-- | linux/Makefile | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/GNUmakefile b/linux/GNUmakefile index f1dbbd1..0967fd6 100644 --- a/linux/GNUmakefile +++ b/linux/GNUmakefile @@ -25,6 +25,7 @@ BINDIR?= $(PREFIX)/bin APPDIR?= $(PREFIX)/share/applications MANDIR?= $(PREFIX)/share/man RESDIR?= $(PREFIX)/share/xombrero +CFLAGS+= -DXT_DS_RESOURCE_DIR=\"$(RESDIR)\" SRCS= $(shell ls ../*.c) SRCS+= linux.c diff --git a/linux/Makefile b/linux/Makefile index 165c6b0..d87bdee 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,5 +1,6 @@ PREFIX?=/usr/local BINDIR=${PREFIX}/bin +CFLAGS+=-DXT_DS_RESOURCE_DIR=\"$(PREFIX)/share/xombrero/\" PROG=xombrero MAN=xombrero.1 @@ -11,7 +12,7 @@ SRCS+= history.c completion.c tldlist.c externaleditor.c unix.c xombrero.c SRCS+= linux.c .PATH: ${.CURDIR}/.. -CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused -Wextra -Wno-unused-parameter +CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused -Wextra -Wno-unused-parameter CFLAGS+= -Wno-missing-field-initializers -Wno-sign-compare CFLAGS+= -Wno-deprecated-declarations -Wfloat-equal ${DEBUG} CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE |