diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | wcsmbs/Makefile | 29 |
2 files changed, 26 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 8fe7af07fd..19a81d4d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-07-21 Roland McGrath <roland@frob.com> + + * wcsmbs/Makefile (strtox-CFLAGS): New variable, + put -I../include before -I../stdlib so we get the right errno.h et al. + (CFLAGS-wcstod.c): Use that variable instead of -I../stdlib. + (CFLAGS-wcstof.c): Likewise. + (CFLAGS-wcstold.c): Likewise. + (CFLAGS-wcstod_l.c): Likewise. + (CFLAGS-wcstof_l.c): Likewise. + (CFLAGS-wcstold_l.c): Likewise. + 2002-07-19 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/errnos.awk: Remove __set_errno defn from output. diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index cf9fcbd6fb..1b403f3a4c 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -47,20 +47,21 @@ include ../Rules CFLAGS-wcwidth.c = -I../wctype CFLAGS-wcswidth.c = -I../wctype -CFLAGS-wcstol.c = -I../stdlib -CFLAGS-wcstoul.c = -I../stdlib -CFLAGS-wcstoll.c = -I../stdlib -CFLAGS-wcstoull.c = -I../stdlib -CFLAGS-wcstod.c = -I../stdlib -CFLAGS-wcstold.c = -I../stdlib -CFLAGS-wcstof.c = -I../stdlib -CFLAGS-wcstol_l.c = -I../stdlib -CFLAGS-wcstoul_l.c = -I../stdlib -CFLAGS-wcstoll_l.c = -I../stdlib -CFLAGS-wcstoull_l.c = -I../stdlib -CFLAGS-wcstod_l.c = -I../stdlib -CFLAGS-wcstold_l.c = -I../stdlib -CFLAGS-wcstof_l.c = -I../stdlib +strtox-CFLAGS = -I../include -I../stdlib +CFLAGS-wcstol.c = $(strtox-CFLAGS) +CFLAGS-wcstoul.c = $(strtox-CFLAGS) +CFLAGS-wcstoll.c = $(strtox-CFLAGS) +CFLAGS-wcstoull.c = $(strtox-CFLAGS) +CFLAGS-wcstod.c = $(strtox-CFLAGS) +CFLAGS-wcstold.c = $(strtox-CFLAGS) +CFLAGS-wcstof.c = $(strtox-CFLAGS) +CFLAGS-wcstol_l.c = $(strtox-CFLAGS) +CFLAGS-wcstoul_l.c = $(strtox-CFLAGS) +CFLAGS-wcstoll_l.c = $(strtox-CFLAGS) +CFLAGS-wcstoull_l.c = $(strtox-CFLAGS) +CFLAGS-wcstod_l.c = $(strtox-CFLAGS) +CFLAGS-wcstold_l.c = $(strtox-CFLAGS) +CFLAGS-wcstof_l.c = $(strtox-CFLAGS) tst-btowc-ENV = LOCPATH=$(common-objpfx)localedata tst-mbrtowc-ENV = LOCPATH=$(common-objpfx)localedata |