Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
562b2f87
Commit
562b2f87
authored
Sep 27, 2012
by
Mike Hibler
Browse files
Fix some symlink targets to work correctly when DESTDIR is set.
parent
49a93222
Changes
3
Hide whitespace changes
Inline
Side-by-side
clientside/tmcc/fedora15/GNUmakefile.in
View file @
562b2f87
...
...
@@ -105,8 +105,8 @@ sysetc-install: ifcfgs dir-install
# See ntpd.service below.
rm -f $(RCDIR)/init.d/ntpd
rm -f $(DEFRUNLVLDIR)/S58ntpd
ln -sf
$(SYSETCDIR)
/dhclient-enter-hooks $(SYSETCDIR)/dhcp/
ln -sf
$(SYSETCDIR)
/dhclient-exit-hooks $(SYSETCDIR)/dhcp/
ln -sf
/etc
/dhclient-enter-hooks $(SYSETCDIR)/dhcp/
ln -sf
/etc
/dhclient-exit-hooks $(SYSETCDIR)/dhcp/
$(INSTALL) -m 644 $(SRCDIR)/ntp.conf $(SYSETCDIR)/ntp.conf
$(INSTALL) -m 644 $(SRCDIR)/ifcfg-eth99 $(SYSETCDIR)/sysconfig/network-scripts
$(INSTALL) -m 644 ifcfg-eth[0-9]* $(SYSETCDIR)/sysconfig/network-scripts
...
...
clientside/tmcc/linux/GNUmakefile.in
View file @
562b2f87
...
...
@@ -282,7 +282,7 @@ vserver-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/vserver/vserver-init.sh $(VSDIR)/
$(INSTALL) -m 755 $(SRCDIR)/vserver/vserver-rc.sh $(VSDIR)/
$(INSTALL) -m 755 $(SRCDIR)/mkvserver.pl $(BINDIR)/mkvserver.pl
-ln -sf $(BINDIR)/mkvserver.pl $(BINDIR)/mkjail.pl
-ln -sf $(
CLIENT_
BINDIR)/mkvserver.pl $(BINDIR)/mkjail.pl
openvz-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/libvnode.pm $(BINDIR)/
...
...
clientside/tmcc/ubuntu11/GNUmakefile.in
View file @
562b2f87
...
...
@@ -91,7 +91,7 @@ sysetc-fixup:
$(SYSETCDIR)/dhcp/dhclient-exit-hooks
$(INSTALL) -m 755 $(SRCDIR)/dhclient-enter-hooks \
$(SYSETCDIR)/dhcp/dhclient-enter-hooks
rm -f
$(RRCDIR)/rc.local
$(SYSETCDIR)/rc.local
rm -f $(SYSETCDIR)/rc.local
$(INSTALL) -m 644 $(SRCDIR)/rc-sysinit.conf $(SYSETCDIR)/init
$(INSTALL) -m 644 $(SRCDIR)/rsyslog-emulab.conf $(SYSETCDIR)/rsyslog.d/60-emulab.conf
$(INSTALL) -m 755 $(SRCDIR)/rc.local $(SYSETCDIR)/rc.local
...
...
@@ -103,10 +103,10 @@ script-install: dir-install $(SCRIPTS)
genirack-install:
(cd ../linux; $(MAKE) DESTDIR=$(DESTDIR) RCDIR=$(RCDIR) genirack-install)
$(INSTALL) -m 755 $(SRCDIR)/genirack.sh $(RCDIR)/init.d/genirack.sh
-ln -sf $(RCDIR)/init.d/genirack.sh $(DEFRUNLVLDIR)/S10genirack.sh
-ln -sf $(RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc2.d/S10genirack.sh
-ln -sf $(RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc4.d/S10genirack.sh
-ln -sf $(RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc5.d/S10genirack.sh
-ln -sf $(
R
RCDIR)/init.d/genirack.sh $(DEFRUNLVLDIR)/S10genirack.sh
-ln -sf $(
R
RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc2.d/S10genirack.sh
-ln -sf $(
R
RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc4.d/S10genirack.sh
-ln -sf $(
R
RCDIR)/init.d/genirack.sh $(SYSETCDIR)/rc5.d/S10genirack.sh
$(INSTALL) -m 644 $(SRCDIR)/interfaces-genirack $(SYSETCDIR)/network/interfaces
$(INSTALL) -m 644 $(SRCDIR)/isc-dhcp-server $(SYSETCDIR)/default/
$(INSTALL) -m 644 $(SRCDIR)/dhcpd.conf $(SYSETCDIR)/dhcp/
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment