diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-10-17 08:48:44 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-10-17 08:48:44 +0000 |
| commit | 3cec7b986b5fd11c24697080b58efe4f0c4c930d (patch) | |
| tree | 309ae3082f0fd9947a7169dbaf6e3ee3320c2344 /Makefile | |
| parent | 43726be15e591210fd7b8b4c483bb7f12de5d15e (diff) | |
if the directory is empty, the mv will fail.
But we don't really care, because the real test for success is the rmdir.
okay matthieu@
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2012/08/18 10:38:39 espie Exp $ +# $OpenBSD: Makefile,v 1.48 2012/10/17 08:48:43 espie Exp $ .include <bsd.own.mk> .include <bsd.xconf.mk> @@ -60,7 +60,7 @@ fix-appd: # Make sure /usr/local/lib/X11/app-defaults is a link if [ ! -L $(DESTDIR)${LOCALAPPD} ]; then \ if [ -d $(DESTDIR)${LOCALAPPD} ]; then \ - mv $(DESTDIR)${LOCALAPPD}/* $(DESTDIR)${REALAPPD}; \ + mv $(DESTDIR)${LOCALAPPD}/* $(DESTDIR)${REALAPPD} || true; \ rmdir $(DESTDIR)${LOCALAPPD}; \ fi; \ mkdir -p ${DESTDIR}${LOCALAPPX}; \ |