| author | xiao qing lu - Sun Microsystems - Beijing China <xiaoqing.lu@oracle.com> |
| Tue, 12 Jul 2016 19:50:03 -0700 | |
| changeset 6403 | 9d25dbe7eb71 |
| parent 5682 | 94c0ca64c022 |
| permissions | -rw-r--r-- |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
1 |
Honor DESTDIR when installing files; simplifies build and packaging. |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
2 |
|
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
3 |
Appropriate for upstream. |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
4 |
--- pconsole-1.0.old/Makefile.in 2001-04-06 18:38:45.000000000 -0700 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
5 |
+++ pconsole-1.0/Makefile.in 2015-12-09 14:18:22.312611616 -0800 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
6 |
@@ -79,19 +79,19 @@ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
7 |
install: all |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
8 |
@( \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
9 |
echo "installing pconsole ..."; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
10 |
- mkdir -p $(bindir) 2>/dev/null ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
11 |
- @INSTALL_PROGRAM@ pconsole $(bindir) ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
12 |
- @INSTALL_SCRIPT@ pconsole.sh $(bindir) ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
13 |
- @INSTALL_SCRIPT@ ssh.sh $(bindir) ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
14 |
+ mkdir -p "$(DESTDIR)$(bindir)" 2>/dev/null ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
15 |
+ @INSTALL_PROGRAM@ pconsole "$(DESTDIR)$(bindir)" ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
16 |
+ @INSTALL_SCRIPT@ pconsole.sh "$(DESTDIR)$(bindir)" ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
17 |
+ @INSTALL_SCRIPT@ ssh.sh "$(DESTDIR)$(bindir)" ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
18 |
echo ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
19 |
echo "Note: You may want to make pconsole setuid root with the following commands:"; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
20 |
echo ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
21 |
- echo " chown root $(bindir)/pconsole ; chmod 4110 $(bindir)/pconsole" ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
22 |
+ echo " chown root $(DESTDIR)$(bindir)/pconsole ; chmod 4110 $(DESTDIR)$(bindir)/pconsole" ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
23 |
echo \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
24 |
) |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
25 |
|
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
26 |
uninstall: |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
27 |
- rm -f $(bindir)/pconsole $(bindir)/pconsole.sh $(bindir)/ssh.sh ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
28 |
- rmdir $(bindir) 2>/dev/null |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
29 |
+ rm -f $(DESTDIR)$(bindir)/pconsole $(DESTDIR)$(bindir)/pconsole.sh $(DESTDIR)$(bindir)/ssh.sh ; \ |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
30 |
+ rmdir $(DESTDIR)$(bindir) 2>/dev/null |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
31 |
|
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff
changeset
|
32 |
# EOB |