diff options
| author | Samuel Thibault <sthibault@debian.org> | 2015-04-18 10:50:57 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2015-04-18 10:50:57 +0000 |
| commit | 65e4661379c1c183ebed368969033fd3bc90fd19 (patch) | |
| tree | 3100f007de59a53eae23bca17d05a185df95de97 /build | |
| parent | cd138f0dd98c789de2ae562064188872124ab5a8 (diff) | |
| download | installation-guide-65e4661379c1c183ebed368969033fd3bc90fd19.zip | |
Avoid copying .svn directory, should fix Jenkins
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 3 | ||||
| -rwxr-xr-x | build/buildone.sh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile index 17f6f786b..fd06b6c80 100644 --- a/build/Makefile +++ b/build/Makefile @@ -29,8 +29,7 @@ $(TARGETS): %: if [ "$$format" = html ]; then \ mkdir -p "$$arch_destination/$$destsuffix/images" ; \ mv ./$$destdir/html/images/* "$$arch_destination/$$destsuffix/images" ; \ - ls -la ./$$destdir/html/images; \ - rmdir ./$$destdir/html/images || true ; \ + rmdir ./$$destdir/html/images ; \ mv ./$$destdir/html/* "$$arch_destination/$$destsuffix" ; \ else \ # Do not fail because of missing PDF support for some languages \ diff --git a/build/buildone.sh b/build/buildone.sh index d5122adc1..78c8041c9 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -133,7 +133,8 @@ create_html () { # Copy the custom css stylesheet to the destination directory cp $stylesheet_css $destdir/html/ - cp -r $stylesheet_images_dir $destdir/html/images + mkdir $destdir/html/images + cp $stylesheet_images_dir/* $destdir/html/images return 0 } |