diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2009-01-29 01:31:11 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2009-01-29 01:31:11 +0000 |
| commit | 7eae5480fb9b973f71691e7e03ee15a4feff187f (patch) | |
| tree | 2fc43f2b73ba94036d6f5e8e2cd29b4158938bde /Makefile.nmake | |
| parent | 0e1613fbe598912370b0b57b0fec0e8bbc33a04a (diff) | |
| download | wireshark-7eae5480fb9b973f71691e7e03ee15a4feff187f.tar.gz | |
trying to "inject" commands into xcopy doesn't work on international windows version. You simply can't answer the question "Datei oder Verzeichnis" with the key 'f' ;-)
Replace this with the triple: "copy, if exist delete, rename" which isn't very nice but at least works on all machines
svn path=/trunk/; revision=27325
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1f5416a180..979a21963d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -961,9 +961,10 @@ install-generated-files: xcopy doc\*.html $(INSTALL_DIR) /d if not exist $(INSTALL_DIR)\help mkdir $(INSTALL_DIR)\help xcopy ".\help\*.*" $(INSTALL_DIR)\help /d -# Oh for crying out loud. Xcopy has a "the destination is a directory" -# flag, but no corresponding "the destination is a file" flag. - echo f | xcopy ".\help\faq.txt" $(INSTALL_DIR)\FAQ /d +# you can't reliably use xcopy to rename files "on the fly" (so copy first, then rename) + xcopy ".\help\faq.txt" $(INSTALL_DIR) /d + if exist $(INSTALL_DIR)\FAQ del $(INSTALL_DIR)\FAQ + ren $(INSTALL_DIR)\faq.txt FAQ if not exist $(INSTALL_DIR)\dtds mkdir $(INSTALL_DIR)\dtds xcopy ".\dtds\*.*" $(INSTALL_DIR)\dtds /d if not exist $(INSTALL_DIR)\asn1 mkdir $(INSTALL_DIR)\asn1 |