diff options
author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-09-30 10:05:33 +0000 |
---|---|---|
committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2006-09-30 10:05:33 +0000 |
commit | 8754ac5d38eb9d9fadd8585665113baf7bcb5ee7 (patch) | |
tree | f53b5c0318e71985c1dedf135cff9765bfc557a1 | |
parent | fbc751fd8fd6fff53e25accf7688c39754099118 (diff) | |
download | libgphoto2-8754ac5d38eb9d9fadd8585665113baf7bcb5ee7.tar.gz |
make really sure that gphoto2/ is removed
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9242 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | configure.in | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index f7a42fb87..92668b96c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,9 +13,10 @@ SUBDIRS = . @subdirs@ libgphoto2 camlibs tests po bindings packaging doc doc_DATA = AUTHORS COPYING README CHANGES NEWS # Remove obsolete directory of copied/symlinked header files +all-local: + if test -d gphoto2; then rm -f gphoto2/gphoto2*.h; rmdir gphoto2; fi clean-local: - rm -f gphoto2/gphoto2*.h - rmdir gphoto2 || true + if test -d gphoto2; then rm -f gphoto2/gphoto2*.h; rmdir gphoto2; fi # we use just ONE .PHONY target in order not to confuse automake diff --git a/configure.in b/configure.in index f997458db..6509c9eb0 100644 --- a/configure.in +++ b/configure.in @@ -538,8 +538,7 @@ fi # Remove obsolete directory of copied files/symlinks # --------------------------------------------------------------------------- -rm -f gphoto2/gphoto2*.h -rmdir gphoto2 || true +if test -d gphoto2; then rm -f gphoto2/gphoto2*.h; rmdir gphoto2; fi # --------------------------------------------------------------------------- |