diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-07-27 09:53:14 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-07-27 09:53:14 +0000 |
| commit | 8d91dc6f510ff95e8c25a8ca8057771ed08018fe (patch) | |
| tree | 3cf6708868415b3d0d019b33ecffb54a5a7ad208 | |
| parent | c77e172f8fa7f212e3c71b11a0351d7f3db8d619 (diff) | |
Merge latest changes from CYGWIN branch
Use find | xargs combination instead of simple shell globbing to prevent
commandline argument overflow
| -rw-r--r-- | cygwin.cf | 8 | ||||
| -rw-r--r-- | cygwin.rules | 11 |
2 files changed, 17 insertions, 2 deletions
@@ -6,13 +6,13 @@ # define CygxVersionMinor 7 #endif #ifndef CygxVersionPatch -# define CygxVersionPatch 0 +# define CygxVersionPatch 1 #endif #ifndef CygxVersionSnap # define CygxVersionSnap 0 #endif #ifndef CygxVersionServer -# define CygxVersionServer 6 +# define CygxVersionServer 0 #endif #ifndef CygxVersion @@ -434,6 +434,10 @@ for flag in ${MAKEFLAGS} ''; do \ @@\ case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done +#ifndef ManSuffix +# define ManSuffix 1 +#endif + #include <cygwin.rules> #if CrossCompiling diff --git a/cygwin.rules b/cygwin.rules index 0037aa4..b743dd5 100644 --- a/cygwin.rules +++ b/cygwin.rules @@ -439,6 +439,17 @@ clean:: @@\ #endif /* ResourceObjectRule */ +/* The arglist can get quite long. Make sure we can delete it though */ +#ifndef MakeFonts +# define MakeFonts() @@\ +all:: $(OBJS) @@\ + @@\ +MakeFontsDir($(OBJS)) @@\ + @@\ +clean:: @@\ + find -name "*.pcf" -o -name "*.pcf.Z" -o -name "*.pcf.gz" | xargs -r rm +#endif /* MakeFonts */ + #ifndef IncludeMakefile #define IncludeMakefile(file) @@sinclude file #endif |