diff options
author | Von Random <von@vdrandom.org> | 2018-12-04 16:15:22 +0300 |
---|---|---|
committer | Von Random <von@vdrandom.org> | 2018-12-04 16:15:22 +0300 |
commit | 77f186c3c68403709234ad367fa55033a66de6dd (patch) | |
tree | 7175c8ca2a9dcf2e1374875414198dfc13269c4a | |
parent | 143bbcc77eea9609e7c96ecd721d47945bf6cf8b (diff) |
some cleanup
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | makest.sh | 7 | ||||
-rw-r--r-- | st-config-mk.patch | 17 | ||||
-rw-r--r-- | st-fix-argv.patch | 11 |
4 files changed, 5 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5979724 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +st/ @@ -5,10 +5,11 @@ ST_CFG=$PWD/config.h PATCHLIST=( st-boxdraw.patch st-bright-bold-text.patch - st-config-mk.patch st-disable-bold-italic-fonts.patch st-disable-intensity-styles.patch - st-fix-argv.patch +) +MAKE_OPTS=( + PREFIX=$HOME/.local ) if [[ ! -r $ST_SRC/.git/config ]]; then @@ -27,4 +28,4 @@ for patch in $PATCHLIST; do patch -p1 -i ../$patch done -make $* +make $MAKE_OPTS $* diff --git a/st-config-mk.patch b/st-config-mk.patch deleted file mode 100644 index 8d425b0..0000000 --- a/st-config-mk.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -4,7 +4,7 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = $(HOME)/.local - MANPREFIX = $(PREFIX)/share/man - - X11INC = /usr/X11R6/include -@@ -30,4 +30,4 @@ - # `pkg-config --libs freetype2` - - # compiler and linker --# CC = c99 -+CC = tcc diff --git a/st-fix-argv.patch b/st-fix-argv.patch deleted file mode 100644 index 572a702..0000000 --- a/st-fix-argv.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arg.h -+++ b/arg.h -@@ -6,7 +6,7 @@ - #ifndef ARG_H__ - #define ARG_H__ - --extern char *argv0; -+static char *argv0; - - /* use main(int argc, char *argv[]) */ - #define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ |