fix build
use config.def.h mechanism add SHELL in config.h
This commit is contained in:
		
							
								
								
									
										5
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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} $<
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@
 | 
			
		||||
#define FONT "6x13"
 | 
			
		||||
#define BOLDFONT "6x13bold"
 | 
			
		||||
#define BORDER 2
 | 
			
		||||
#define SHELL "/bin/sh"
 | 
			
		||||
 | 
			
		||||
/* Terminal colors */
 | 
			
		||||
static const char *colorname[] = {
 | 
			
		||||
							
								
								
									
										6
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								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);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user