Skip to content
Permalink
Browse files

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).
  • Loading branch information...
jcvernaleo committed Jul 1, 2014
1 parent bf6ffda commit 3f2826210b1128657d474926f52f5f097d706bf2
Showing with 9 additions and 3 deletions.
  1. +1 −0 Makefile
  2. +1 −0 dragonfly/Makefile
  3. +1 −0 freebsd/Makefile
  4. +1 −0 linux/GNUmakefile
  5. +2 −1 linux/Makefile
  6. +2 −1 netbsd/Makefile
  7. +1 −0 osx/Makefile
  8. +0 −1 xombrero.h
@@ -1,5 +1,6 @@
PREFIX?=/usr/local
BINDIR=${PREFIX}/bin
CFLAGS+= -DXT_DS_RESOURCE_DIR=\"$(PREFIX)/share/xombrero/\"

PROG=xombrero
MAN=xombrero.1
@@ -16,6 +16,7 @@ PREFIX?= /usr/local
BINDIR?= $(PREFIX)/bin
MANDIR?= $(PREFIX)/man
RESDIR?= $(PREFIX)/share/xombrero/
CFLAGS+= -DXT_DS_RESOURCE_DIR=\"$(RESDIR)\"

CC= cc

@@ -16,6 +16,7 @@ PREFIX?= /usr/local
BINDIR?= $(PREFIX)/bin
MANDIR?= $(PREFIX)/man
RESDIR?= $(PREFIX)/share/xombrero
CFLAGS+= -DXT_DS_RESOURCE_DIR=\"$(RESDIR)\"

CC?= cc

@@ -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
@@ -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
@@ -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+= netbsd.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
@@ -17,6 +17,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+= osx.c
@@ -689,7 +689,6 @@ int command_mode(struct tab *, struct karg *);
#define XT_DS_ALLOW_INSECURE_CONTENT (TRUE)
#define XT_DS_ALLOW_INSECURE_SCRIPTS (TRUE)
#define XT_DS_WARN_CERT_CHANGES (0)
#define XT_DS_RESOURCE_DIR ("/usr/local/share/xombrero")
#define XT_DS_DO_NOT_TRACK (0)
#define XT_DS_PRELOAD_STRICT_TRANSPORT (1)
#define XT_DS_GNUTLS_PRIORITY_STRING (NULL)

0 comments on commit 3f28262

Please sign in to comment.
You can’t perform that action at this time.