Missed a few DESTDIR, noticeable when you install Read-Only.

This commit is contained in:
espie 2000-04-04 14:55:16 +00:00
parent 2a9292b4a1
commit 58dc743df6
4 changed files with 47 additions and 18 deletions

View File

@ -1,6 +1,6 @@
--- ./bitmaps/Imakefile.orig Tue Jun 29 07:19:54 1993
+++ ./bitmaps/Imakefile Sat Apr 1 18:24:54 2000
@@ -34,9 +34,9 @@ SRCS = \
--- bitmaps/Imakefile.orig Tue Jun 29 07:19:54 1993
+++ bitmaps/Imakefile Tue Apr 4 02:59:36 2000
@@ -34,12 +34,12 @@ SRCS = \
ALLFILES = $(BITMAPS)
@ -11,4 +11,8 @@
+BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.)
install:: $(SRCS)
$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
- $(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
+ $(MKDIRHIER) $(DESTDIR)$(HEADER_DEST)/$(BITMAPINC)
InstallMultiple($(SRCS),$(HEADER_DEST)/$(BITMAPINC))

View File

@ -1,5 +1,5 @@
--- ./config/XView.obj.orig Tue Jun 29 07:13:20 1993
+++ ./config/XView.obj Sat Apr 1 18:23:44 2000
--- config/XView.obj.orig Tue Jun 29 07:13:20 1993
+++ config/XView.obj Tue Apr 4 02:26:55 2000
@@ -15,7 +15,7 @@
STD_DEFINES = StandardDefines LibXViewDefines
#endif
@ -9,7 +9,7 @@
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
ALLFILES = $(SRCS) $(HEADERS)
@@ -85,14 +85,14 @@ NormalLintTarget($(SRCS))
@@ -85,17 +85,17 @@ NormalLintTarget($(SRCS))
#if SubdirHasPublicHeaders
# if NotLibXView
@ -17,7 +17,8 @@
+BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
install::
$(MKDIRHIER) $(PUB_HEADER_DEST)
- $(MKDIRHIER) $(PUB_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
@ -25,8 +26,12 @@
+BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
install::
$(MKDIRHIER) $(XVPUB_HEADER_DEST)
@@ -103,9 +103,9 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
- $(MKDIRHIER) $(XVPUB_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
# endif
@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
#if SubdirHasPrivateHeaders
# if NotLibXView
@ -38,3 +43,15 @@
# endif
# if InstallPrivateHeaders
# if NotLibXView
install::
- $(MKDIRHIER) $(PRI_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
# else
install::
- $(MKDIRHIER) $(XVPRI_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
# endif

View File

@ -1,6 +1,6 @@
--- ./images/Imakefile.orig Tue Jun 29 07:18:41 1993
+++ ./images/Imakefile Sat Apr 1 18:24:54 2000
@@ -99,9 +99,9 @@ SRCS = \
--- images/Imakefile.orig Tue Jun 29 07:18:41 1993
+++ images/Imakefile Tue Apr 4 02:57:31 2000
@@ -99,12 +99,12 @@ SRCS = \
ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES)
@ -11,4 +11,8 @@
+BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
install:: $(SRCS)
$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
- $(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
+ $(MKDIRHIER) $(DESTDIR)$(HEADER_DEST)/$(IMAGEINC)
InstallMultiple($(SRCS),$(HEADER_DEST)/$(IMAGEINC))

View File

@ -1,6 +1,6 @@
--- ./lib/pixrect/Imakefile.orig Tue Jun 29 07:18:39 1993
+++ ./lib/pixrect/Imakefile Sat Apr 1 18:24:54 2000
@@ -41,8 +41,8 @@ ALLFILES = $(HEADERS)
--- lib/pixrect/Imakefile.orig Tue Jun 29 07:18:39 1993
+++ lib/pixrect/Imakefile Tue Apr 4 02:54:36 2000
@@ -41,11 +41,11 @@ ALLFILES = $(HEADERS)
all::
#if InstallPixrectHeaders
@ -10,4 +10,8 @@
+BuildIncludes($(HEADERS2),$(INCDIR),.)
install::
$(MKDIRHIER) $(PIXRECT_HEADER_DEST)
- $(MKDIRHIER) $(PIXRECT_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(PIXRECT_HEADER_DEST)
InstallMultiple($(HEADERS),$(PIXRECT_HEADER_DEST))
#else