Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace use of "install -d" #14

Merged
merged 1 commit into from
Mar 31, 2014
Merged

Replace use of "install -d" #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Makefile.PL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

use inc::Module::Install;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea why this line was removed. I used the online GitHub editor because I'm lazy. If it's a problem, let me know and I'll amend this pull request to avoid this unwanted change.

use English qw(-no_match_vars);

Expand Down Expand Up @@ -199,19 +198,22 @@ sub install {
$install .= <<'EOF';

config_install :
install -d -m 755 $(DESTDIR)$(SYSCONFDIR)
mkdir -p 755 $(DESTDIR)$(SYSCONFDIR)
chmod 755 $(DESTDIR)$(SYSCONFDIR)
if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \
install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \
else \
install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \
fi

data_install :
install -d -m 755 $(DESTDIR)$(DATADIR)
mkdir -p 755 $(DESTDIR)$(DATADIR)
chmod 755 $(DESTDIR)$(DATADIR)
install -m 644 share/pci.ids $(DESTDIR)$(DATADIR)/
install -m 644 share/usb.ids $(DESTDIR)$(DATADIR)/
install -m 644 share/sysobjectid.*.ids $(DESTDIR)$(DATADIR)/
install -d -m 755 $(DESTDIR)$(DATADIR)/html
mkdir -p $(DESTDIR)$(DATADIR)/html
chmod 755 $(DESTDIR)$(DATADIR)/html
install -m 644 share/html/* $(DESTDIR)$(DATADIR)/html
EOF
return $install;
Expand Down