diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2011-04-17 22:30:51 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2011-04-17 22:30:51 +0800 |
| commit | 4cb0f24c27ab3a943e7a216a086961a6fb8630e7 (patch) | |
| tree | 460287f0421782d6f0d454b56183fc1d6582f18f | |
| parent | 14670a93c3242a4df8bbbe86e459640a022a45eb (diff) | |
| download | pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar.gz pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar.bz2 pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar.lz pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar.xz pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.tar.zst pttbbs-4cb0f24c27ab3a943e7a216a086961a6fb8630e7.zip | |
improve 'CONVERT' config probing
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5341 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/common/sys/Makefile | 2 | ||||
| -rw-r--r-- | pttbbs/pttbbs.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pttbbs/common/sys/Makefile b/pttbbs/common/sys/Makefile index 0fd27d47..8b587a3b 100644 --- a/pttbbs/common/sys/Makefile +++ b/pttbbs/common/sys/Makefile @@ -6,7 +6,7 @@ SRCROOT= ../.. SRCS:= daemon.c file.c lock.c log.c net.c sort.c string.c time.c \ crypt.c record.c vector.c telnet.c vbuf.c vtkbd.c -.if $(WANTS_CONVERT) != "NO" +.if $(WITH_CONVERT) != "NO" SRCS+= utf8.c big5.c .endif diff --git a/pttbbs/pttbbs.mk b/pttbbs/pttbbs.mk index 92cfc49b..cb4ce2b9 100644 --- a/pttbbs/pttbbs.mk +++ b/pttbbs/pttbbs.mk @@ -10,7 +10,7 @@ OSTYPE!= uname CC:= gcc CXX:= g++ CCACHE!= which ccache|sed -e 's/^.*\///' -WANTS_CONVERT!= sh -c 'grep "^\#define CONVERT" $(SRCROOT)/pttbbs.conf || echo NO' +WITH_CONVERT!= sh -c 'grep -w "^[\t ]*\#define[ \t]*CONVERT" $(SRCROOT)/pttbbs.conf || echo NO' .if $(CCACHE) CC:= ccache $(CC) |