Imported Upstream version 7.1

[platform/upstream/dos2unix.git] / djgpp.mak

diff --git a/djgpp.mak b/djgpp.mak
index 25c0954..e07f7ab 100644 (file)
--- a/djgpp.mak
+++ b/djgpp.mak
@@ -1,26 +1,31 @@
 \r
 # Author: Erwin Waterlander\r
-# Copyright (C) 2009-2012 Erwin Waterlander\r
+# Copyright (C) 2009-2014 Erwin Waterlander\r
 # This file is distributed under the same license as the dos2unix package.\r
 \r
-prefix=c:/djgpp\r
-#ENABLE_NLS=1\r
+include version.mk\r
+\r
+prefix=c:/dos32\r
 ENABLE_NLS=\r
 VERSIONSUFFIX=-dos32\r
 \r
 ifdef ENABLE_NLS\r
-LDFLAGS_EXTRA = -lintl -liconv\r
+LIBS_EXTRA = -lintl -liconv\r
+NLS_SUFFIX = -nls\r
 endif\r
+VERSIONSUFFIX = pm\r
+ZIPFILE = d2u$(DOS2UNIX_VERSION_SHORT)$(VERSIONSUFFIX)$(NLS_SUFFIX).zip\r
 ZIPOBJ_EXTRA = bin/cwsdpmi.exe\r
+docsubdir = dos2unix\r
 \r
 all:\r
-       $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=dos2unix EO_XNOTATION=1 UCS=\r
+       $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS=\r
 \r
 install:\r
-       $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=dos2unix EO_XNOTATION=1 UCS=\r
+       $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS=\r
 \r
 uninstall:\r
-       $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=dos2unix\r
+       $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir)\r
 \r
 clean:\r
        $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)\r
@@ -29,8 +34,12 @@ mostlyclean:
        $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)\r
 \r
 dist:\r
-       $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) docsubdir=dos2unix\r
+       $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) ZIPFILE=${ZIPFILE} docsubdir=$(docsubdir)\r
 \r
 strip:\r
        $(MAKE) strip LINK_MAN="cp -f" EXE=.exe\r
+       # Fix time stamps. Otherwise make install may rebuild mac2unix unix2mac.\r
+       # Now make install can be done in MSYS. In djgpp bash install is problematic.\r
+       touch mac2unix.exe\r
+       touch unix2mac.exe\r
 \r