pk
/
st
mirror of https://github.com/pikami/st.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use predefined OS macro instead of uname.

This commit is contained in:
Aurélien Aptel 2010-08-30 13:04:19 +02:00
parent bef87acd0d
commit ae5baac932
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -10,7 +10,6 @@ all: options st
options: options:
@echo st build options: @echo st build options:
@echo "SYSTEM = ${SYSTEM}"
@echo "CFLAGS = ${CFLAGS}" @echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}" @echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}" @echo "CC = ${CC}"

9
config.mk
View File

@ -14,15 +14,8 @@ X11LIB = /usr/X11R6/lib
INCS = -I. -I/usr/include -I${X11INC} INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil
# uncomment manualy your system if compilation fail
SYSTEM = -D`uname | tr a-z A-Z`
#SYSTEM = -DLINUX
#SYSTEM = -DOPENBSD
#SYSTEM = -DFREEBSD
#SYSTEM = -DNETBSD
# flags # flags
CPPFLAGS = -DVERSION=\"${VERSION}\" ${SYSTEM} CPPFLAGS = -DVERSION=\"${VERSION}\"
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS} LDFLAGS = -s ${LIBS}

6
st.c
View File

@ -20,11 +20,11 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#if defined(LINUX) #if defined(__linux)
#include <pty.h> #include <pty.h>
#elif defined(OPENBSD) || defined(NETBSD) #elif defined(__OpenBSD__) || defined(__NetBSD__)
#include <util.h> #include <util.h>
#elif defined(FREEBSD) #elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h> #include <libutil.h>
#endif #endif