Skip to content

Commit e587486

Browse files
AMDmi3AMDmi3
committed
Fix staging directory variable name
DISTDIR, not a STAGEDIR is used to specify a staging directory See https://www.gnu.org/prep/standards/html_node/DESTDIR.html
1 parent 3926bfa commit e587486

File tree

1 file changed

+54
-54
lines changed

1 file changed

+54
-54
lines changed

‎Makefile‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -60,86 +60,86 @@ all:
6060
@echo " DOCDIR=${DATDIR}/doc"
6161

6262
install:
63-
${MKDIR} ${STAGEDIR}${BINDIR}
63+
${MKDIR} ${DESTDIR}${BINDIR}
6464
@for i in ${COMMANDS}; \
6565
do \
66-
echo ${INSTALL_PROGRAM} COMMANDS/$${i} ${STAGEDIR}${BINDIR}; \
67-
${INSTALL_PROGRAM} COMMANDS/$${i} ${STAGEDIR}${BINDIR}; \
66+
echo ${INSTALL_PROGRAM} COMMANDS/$${i} ${DESTDIR}${BINDIR}; \
67+
${INSTALL_PROGRAM} COMMANDS/$${i} ${DESTDIR}${BINDIR}; \
6868
done
69-
${MKDIR} ${STAGEDIR}${DOCDIR}
69+
${MKDIR} ${DESTDIR}${DOCDIR}
7070
@for i in ${DOC}; \
7171
do \
72-
echo ${INSTALL_DOCS} $${i} ${STAGEDIR}${DOCDIR}; \
73-
${INSTALL_DOCS} $${i} ${STAGEDIR}${DOCDIR}; \
72+
echo ${INSTALL_DOCS} $${i} ${DESTDIR}${DOCDIR}; \
73+
${INSTALL_DOCS} $${i} ${DESTDIR}${DOCDIR}; \
7474
done
75-
${MKDIR} ${STAGEDIR}${MANDIR}
75+
${MKDIR} ${DESTDIR}${MANDIR}
7676
@for i in ${MANUAL}; \
7777
do \
78-
echo ${INSTALL_DOCS} MANUAL/$${i} ${STAGEDIR}${MANDIR}; \
79-
${INSTALL_DOCS} MANUAL/$${i} ${STAGEDIR}${MANDIR}; \
78+
echo ${INSTALL_DOCS} MANUAL/$${i} ${DESTDIR}${MANDIR}; \
79+
${INSTALL_DOCS} MANUAL/$${i} ${DESTDIR}${MANDIR}; \
8080
done
81-
${MKDIR} ${STAGEDIR}${HTMDIR}
81+
${MKDIR} ${DESTDIR}${HTMDIR}
8282
@for i in ${HTML}; \
8383
do \
84-
echo ${INSTALL_DOCS} MANUALHTML/$${i} ${STAGEDIR}${HTMDIR}; \
85-
${INSTALL_DOCS} MANUALHTML/$${i} ${STAGEDIR}${HTMDIR}; \
84+
echo ${INSTALL_DOCS} MANUALHTML/$${i} ${DESTDIR}${HTMDIR}; \
85+
${INSTALL_DOCS} MANUALHTML/$${i} ${DESTDIR}${HTMDIR}; \
8686
done
87-
${MKDIR} ${STAGEDIR}${HTMDIR}/COMMON/CSS
88-
${MKDIR} ${STAGEDIR}${HTMDIR}/COMMON/IMG
89-
${MKDIR} ${STAGEDIR}${HTMDIR}/COMMON/JS
90-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/MAIN.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
91-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/MENU.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
92-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/PRINT.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
93-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE7HACK.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
94-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE6HACK.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
95-
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE67HACK.CSS ${STAGEDIR}${HTMDIR}/COMMON/CSS/
96-
${INSTALL_DOCS} MANUALHTML/COMMON/IMG/BACKGROUND.JPG ${STAGEDIR}${HTMDIR}/COMMON/IMG/
97-
${INSTALL_DOCS} MANUALHTML/COMMON/IMG/TUKUBAI_LOGO.JPG ${STAGEDIR}${HTMDIR}/COMMON/IMG/
98-
${INSTALL_DOCS} MANUALHTML/COMMON/JS/MENU.JS ${STAGEDIR}${HTMDIR}/COMMON/JS/
99-
${MKDIR} ${STAGEDIR}${PDFDIR}
100-
${INSTALL_DOCS} MANUALPDF/all.pdf ${STAGEDIR}${PDFDIR}
87+
${MKDIR} ${DESTDIR}${HTMDIR}/COMMON/CSS
88+
${MKDIR} ${DESTDIR}${HTMDIR}/COMMON/IMG
89+
${MKDIR} ${DESTDIR}${HTMDIR}/COMMON/JS
90+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/MAIN.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
91+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/MENU.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
92+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/PRINT.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
93+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE7HACK.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
94+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE6HACK.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
95+
${INSTALL_DOCS} MANUALHTML/COMMON/CSS/IE67HACK.CSS ${DESTDIR}${HTMDIR}/COMMON/CSS/
96+
${INSTALL_DOCS} MANUALHTML/COMMON/IMG/BACKGROUND.JPG ${DESTDIR}${HTMDIR}/COMMON/IMG/
97+
${INSTALL_DOCS} MANUALHTML/COMMON/IMG/TUKUBAI_LOGO.JPG ${DESTDIR}${HTMDIR}/COMMON/IMG/
98+
${INSTALL_DOCS} MANUALHTML/COMMON/JS/MENU.JS ${DESTDIR}${HTMDIR}/COMMON/JS/
99+
${MKDIR} ${DESTDIR}${PDFDIR}
100+
${INSTALL_DOCS} MANUALPDF/all.pdf ${DESTDIR}${PDFDIR}
101101

102102
uninstall:
103103
@for i in ${COMMANDS}; \
104104
do \
105-
echo ${RM} ${STAGEDIR}${BINDIR}/$${i}; \
106-
${RM} ${STAGEDIR}${BINDIR}/$${i}; \
105+
echo ${RM} ${DESTDIR}${BINDIR}/$${i}; \
106+
${RM} ${DESTDIR}${BINDIR}/$${i}; \
107107
done
108108
@for i in ${DOC}; \
109109
do \
110-
echo ${RM} ${STAGEDIR}${DOCDIR}/$${i}; \
111-
${RM} ${STAGEDIR}${DOCDIR}/$${i}; \
110+
echo ${RM} ${DESTDIR}${DOCDIR}/$${i}; \
111+
${RM} ${DESTDIR}${DOCDIR}/$${i}; \
112112
done
113113
@for i in ${MANUAL}; \
114114
do \
115-
echo ${RM} ${STAGEDIR}${MANDIR}/$${i}; \
116-
${RM} ${STAGEDIR}${MANDIR}/$${i}; \
115+
echo ${RM} ${DESTDIR}${MANDIR}/$${i}; \
116+
${RM} ${DESTDIR}${MANDIR}/$${i}; \
117117
done
118118
@for i in ${HTML}; \
119119
do \
120-
echo ${RM} ${STAGEDIR}${HTMDIR}/$${i}; \
121-
${RM} ${STAGEDIR}${HTMDIR}/$${i}; \
120+
echo ${RM} ${DESTDIR}${HTMDIR}/$${i}; \
121+
${RM} ${DESTDIR}${HTMDIR}/$${i}; \
122122
done
123-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/MAIN.CSS
124-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/MENU.CSS
125-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/PRINT.CSS
126-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/IE7HACK.CSS
127-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/IE6HACK.CSS
128-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/CSS/IE67HACK.CSS
129-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/IMG/BACKGROUND.JPG
130-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/IMG/TUKUBAI_LOGO.JPG
131-
${RM} ${STAGEDIR}${HTMDIR}/COMMON/JS/MENU.JS
132-
${RM} ${STAGEDIR}${PDFDIR}/all.pdf
133-
${RMDIR} ${STAGEDIR}${DOCDIR}
134-
${RMDIR} ${STAGEDIR}${MANDIR}
135-
${RMDIR} ${STAGEDIR}${HTMDIR}/COMMON/CSS
136-
${RMDIR} ${STAGEDIR}${HTMDIR}/COMMON/IMG
137-
${RMDIR} ${STAGEDIR}${HTMDIR}/COMMON/JS
138-
${RMDIR} ${STAGEDIR}${HTMDIR}/COMMON
139-
${RMDIR} ${STAGEDIR}${HTMDIR}
140-
${RMDIR} ${STAGEDIR}${PDFDIR}
141-
${RMDIR} ${STAGEDIR}${DATDIR}
142-
${RMDIR} ${STAGEDIR}${TUKDIR}
123+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/MAIN.CSS
124+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/MENU.CSS
125+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/PRINT.CSS
126+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/IE7HACK.CSS
127+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/IE6HACK.CSS
128+
${RM} ${DESTDIR}${HTMDIR}/COMMON/CSS/IE67HACK.CSS
129+
${RM} ${DESTDIR}${HTMDIR}/COMMON/IMG/BACKGROUND.JPG
130+
${RM} ${DESTDIR}${HTMDIR}/COMMON/IMG/TUKUBAI_LOGO.JPG
131+
${RM} ${DESTDIR}${HTMDIR}/COMMON/JS/MENU.JS
132+
${RM} ${DESTDIR}${PDFDIR}/all.pdf
133+
${RMDIR} ${DESTDIR}${DOCDIR}
134+
${RMDIR} ${DESTDIR}${MANDIR}
135+
${RMDIR} ${DESTDIR}${HTMDIR}/COMMON/CSS
136+
${RMDIR} ${DESTDIR}${HTMDIR}/COMMON/IMG
137+
${RMDIR} ${DESTDIR}${HTMDIR}/COMMON/JS
138+
${RMDIR} ${DESTDIR}${HTMDIR}/COMMON
139+
${RMDIR} ${DESTDIR}${HTMDIR}
140+
${RMDIR} ${DESTDIR}${PDFDIR}
141+
${RMDIR} ${DESTDIR}${DATDIR}
142+
${RMDIR} ${DESTDIR}${TUKDIR}
143143

144144
deinstall: uninstall
145145

0 commit comments

Comments
 (0)