31 lines
902 B
Diff
31 lines
902 B
Diff
|
diff -up dos2unix-4.1.1/Makefile.CFLAGS dos2unix-4.1.1/Makefile
|
||
|
|
--- dos2unix-4.1.1/Makefile.CFLAGS 2010-01-22 10:00:01.207058452 +0000
|
||
|
|
+++ dos2unix-4.1.1/Makefile 2010-01-22 10:01:15.224057831 +0000
|
||
|
|
@@ -116,15 +116,14 @@ endif
|
||
|
|
|
||
|
|
# ............................................................ flags ...
|
||
|
|
|
||
|
|
-GCCFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE
|
||
|
|
+CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE
|
||
|
|
|
||
|
|
ifdef STATIC
|
||
|
|
GCCFLAGS += -static
|
||
|
|
endif
|
||
|
|
|
||
|
|
-CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
|
||
|
|
+EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
|
||
|
|
-DVER_DATE=\"$(DOS2UNIX_DATE)\" \
|
||
|
|
- $(GCCFLAGS) \
|
||
|
|
$(CFLAGS_OS) \
|
||
|
|
$(NLSDEFS)
|
||
|
|
|
||
|
|
@@ -138,7 +137,7 @@ DEFS = $(EXTRA_DEFS)
|
||
|
|
all: $(BIN) $(MAC2UNIX_BIN) $(MAC2UNIX).1 $(DOCFILES) $(MOFILES)
|
||
|
|
|
||
|
|
%.o : %.c
|
||
|
|
- $(CC) $(CFLAGS) $(DEFS) -c $< -o $@
|
||
|
|
+ $(CC) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFS) -c $< -o $@
|
||
|
|
|
||
|
|
$(BIN): dos2unix.o
|
||
|
|
$(CC) $< $(LDFLAGS) -o $@
|