| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 244861e2c9bb9cc44f4bd246964ba850a7cf1216 Mon Sep 17 00:00:00 2001 |
| 2 | From: Xin Ouyang <Xin.Ouyang@windriver.com> |
| 3 | Date: Tue, 15 May 2012 15:06:43 +0800 |
| 4 | Subject: [PATCH] rdist: bitbake build |
| 5 | |
| 6 | Upstream-Status: Inappropriate [OE specific] |
| 7 | |
| 8 | --- |
| 9 | Makefile.local | 8 ++++---- |
| 10 | doc/Makefile.real | 4 +++- |
| 11 | src/Makefile.real | 1 + |
| 12 | 3 files changed, 8 insertions(+), 5 deletions(-) |
| 13 | |
| 14 | diff --git a/Makefile.local b/Makefile.local |
| 15 | index 26092b2..389cb84 100644 |
| 16 | --- a/Makefile.local |
| 17 | +++ b/Makefile.local |
| 18 | @@ -14,7 +14,7 @@ |
| 19 | # BIN_DIR variable, you would uncomment the following line |
| 20 | # or add your own line. |
| 21 | # |
| 22 | -#BIN_DIR = /usr/bin |
| 23 | +BIN_DIR = ${DESTDIR}/${bindir} |
| 24 | |
| 25 | # |
| 26 | # Add any local definitions you want pass to the compiler to DEFS_LOCAL |
| 27 | @@ -46,13 +46,13 @@ LIBS_LOCAL = |
| 28 | # Set a site specific install program to use. Must support BSD style |
| 29 | # install(1) arguments. |
| 30 | # |
| 31 | -#INSTALL = install |
| 32 | +INSTALL = install |
| 33 | |
| 34 | # |
| 35 | # Site specific Man Page configuration. |
| 36 | # |
| 37 | -#MAN_1_DIR = /usr/local/man/man1 |
| 38 | -#MAN_8_DIR = /usr/local/man/man8 |
| 39 | +MAN_1_DIR = ${DESTDIR}/${mandir}/man1 |
| 40 | +MAN_8_DIR = ${DESTDIR}/${mandir}/man8 |
| 41 | #MAN_OWNER = bin |
| 42 | #MAN_GROUP = bin |
| 43 | #MAN_MODE = 644 |
| 44 | diff --git a/doc/Makefile.real b/doc/Makefile.real |
| 45 | index 42cabec..e32c30b 100644 |
| 46 | --- a/doc/Makefile.real |
| 47 | +++ b/doc/Makefile.real |
| 48 | @@ -16,9 +16,11 @@ all: |
| 49 | |
| 50 | doc: |
| 51 | |
| 52 | -install: |
| 53 | +install: install.man |
| 54 | |
| 55 | install.man: rdist.man rdistd.man |
| 56 | + test -d ${MAN_1_DIR} || ${INSTALL} -d ${MAN_1_DIR} |
| 57 | + test -d ${MAN_8_DIR} || ${INSTALL} -d ${MAN_8_DIR} |
| 58 | ${INSTALL} ${INSTALL_ARGS} rdist.man ${CLIENT_DEST} |
| 59 | ${INSTALL} ${INSTALL_ARGS} rdistd.man ${SERVER_DEST} |
| 60 | |
| 61 | diff --git a/src/Makefile.real b/src/Makefile.real |
| 62 | index 02179e4..9ec551d 100644 |
| 63 | --- a/src/Makefile.real |
| 64 | +++ b/src/Makefile.real |
| 65 | @@ -52,6 +52,7 @@ clean: |
| 66 | $(COMMONOBJS) $(MISSINGOBJS) |
| 67 | |
| 68 | install: |
| 69 | + test -d $(BIN_DIR) || $(INSTALL) -d $(BIN_DIR) |
| 70 | $(INSTALL) ${IN_ARGS} -o $(BIN_OWNER) -m ${RDIST_MODE} \ |
| 71 | $(CLIENT_BIN) $(BIN_DIR)/$(CLIENT) |
| 72 | $(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \ |
| 73 | -- |
| 74 | 1.7.5.4 |
| 75 | |