fix build

use config.def.h mechanism
add SHELL in config.h

diff --git a/Makefile b/Makefile
index 2fb13ae20c08cb014cec1b3825115b5a98d5f50f..52674114628148c89e0ce5fbf11251dc40549c5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,15 @@ OBJ = ${SRC:.c=.o}
 
 all: options st
 
-options:
+options: options
        @echo st build options:
        @echo "CFLAGS   = ${CFLAGS}"
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 
+config.h:
+       cp config.def.h config.h
+
 .c.o:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<

diff --git a/config.h b/config.def.h
similarity index 89%
rename from config.h
rename to config.def.h
index 8c37b1608667e41a5b4c8951325bab18e7492d8a..9506bc644b4974ca0c35a73c22fe8e11ea630898 100644 (file)
--- a/config.h
+++ b/config.def.h
@@ -3,6 +3,7 @@
 #define FONT "6x13"
 #define BOLDFONT "6x13bold"
 #define BORDER 2
+#define SHELL "/bin/sh"
 
 /* Terminal colors */
 static const char *colorname[] = {
@@ -33,11 +34,11 @@ static const char *colorname[] = {
 /* special keys */
 static Key key[] = {
        { XK_BackSpace, "\177" },
-       { XK_Delete, "\033[3~" },
-       { XK_Home,   "\033[1~" },
-       { XK_End,    "\033[4~" },
-       { XK_Prior,  "\033[5~" },
-       { XK_Next,   "\033[6~" },
+       { XK_Delete,    "\033[3~" },
+       { XK_Home,      "\033[1~" },
+       { XK_End,       "\033[4~" },
+       { XK_Prior,     "\033[5~" },
+       { XK_Next,      "\033[6~" },
        { XK_F1,        "\033OP"   },
        { XK_F2,        "\033OQ"   },
        { XK_F3,        "\033OR"   },

diff --git a/st.c b/st.c
index 864dfc7179c1c6171ab2fcea74e09a2a5698e012..0b21404ab8618114ce8b7eaa02b5644aefef47ec 100644 (file)
--- a/st.c
+++ b/st.c
@@ -213,10 +213,10 @@ static inline int selected(int x, int y) {
        if ((seley==y && selby==y)) {
                int bx = MIN(selbx, selex);
                int ex = MAX(selbx, selex);
-               return if(x>=bx && x<=ex)
+               return (x>=bx && x<=ex);
        }
        return (((y>sb[1] && y<se[1]) || (y==se[1] && x<=se[0])) || \
-               (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1])))
+               (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1])));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -331,7 +331,7 @@ die(const char *errstr, ...) {
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
-       DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */
+       DEFAULT(args[0], SHELL); /* if getenv() failed */
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }