| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Fri, 30 Jan 2015 00:40:22 -0800 |
| 4 | Subject: [PATCH] contrib.mak: fix for parallel build |
| 5 | |
| 6 | Fixed: |
| 7 | rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory |
| 8 | |
| 9 | Create lib before install to fix the race issue. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 14 | --- |
| 15 | contrib/contrib.mak | 2 ++ |
| 16 | 1 file changed, 2 insertions(+) |
| 17 | |
| 18 | diff --git a/contrib/contrib.mak b/contrib/contrib.mak |
| 19 | index 08a80d1..de2e20d 100644 |
| 20 | --- a/contrib/contrib.mak |
| 21 | +++ b/contrib/contrib.mak |
| 22 | @@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h |
| 23 | $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c |
| 24 | |
| 25 | extra-dmprt-install: |
| 26 | + mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib |
| 27 | $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 |
| 28 | $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 |
| 29 | $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 |
| 30 | @@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) |
| 31 | ### ----------------- Additional .upp files ---------------- ### |
| 32 | |
| 33 | extra-upp-install: |
| 34 | + mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib |
| 35 | for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ |
| 36 | $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ |
| 37 | done |
| 38 | -- |
| 39 | 1.7.9.5 |
| 40 | |