projects / people / stevee / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| ed0a9fda SS |
1 | commit 1e12605eac293b12809ca2933622acc54515c237 |
| 2 | Author: Nils Philippsen <nils@redhat.com> | |
| 3 | Date: Mon Dec 28 17:00:25 2009 +0100 | |
| 4 | ||
| 5 | patch: lockdir | |
| 6 | ||
| 7 | Squashed commit of the following: | |
| 8 | ||
| 9 | commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb | |
| 10 | Author: Nils Philippsen <nils@redhat.com> | |
| 11 | Date: Mon Dec 28 16:58:36 2009 +0100 | |
| 12 | ||
| 13 | improve install-lockpath target | |
| 14 | ||
| 15 | make robust against problems with setting group on sane lock dir | |
| 16 | ||
| 17 | diff --git a/backend/Makefile.am b/backend/Makefile.am | |
| 18 | index 5165423..3c22cd4 100644 | |
| 19 | --- a/backend/Makefile.am | |
| 20 | +++ b/backend/Makefile.am | |
| 21 | @@ -137,7 +137,8 @@ install-firmware-path: | |
| 22 | done | |
| 23 | ||
| 24 | install-lockpath: | |
| 25 | - $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) | |
| 26 | + $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \ | |
| 27 | + $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir) | |
| 28 | ||
| 29 | uninstall-hook: | |
| 30 | rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir) |