You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
135 lines
4.4 KiB
135 lines
4.4 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../incron/incron-0.5.9-Makefile.patch |
|
# Copyright (C) 2012 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
From 3f4e9ad5e9cf57fabdcaa3c1bc296b449c061a1b Mon Sep 17 00:00:00 2001 |
|
From: Christian Ruppert <[email protected]> |
|
Date: Mon, 31 Jan 2011 16:00:34 +0100 |
|
Subject: [PATCH 2/2] Some improvements |
|
|
|
Respect DESTDIR. |
|
Don't override CXX/CXXFLAGS/LDFLAGS. |
|
Create all necessary directories during install. |
|
Install the example configuration into $(PREFIX)/share/doc/... instead of /etc. |
|
--- |
|
Makefile | 57 +++++++++++++++++++++++++++++---------------------------- |
|
1 files changed, 29 insertions(+), 28 deletions(-) |
|
|
|
diff --git a/Makefile b/Makefile |
|
index ded8e68..3ffc854 100644 |
|
--- a/Makefile |
|
+++ b/Makefile |
|
@@ -1,15 +1,15 @@ |
|
- |
|
PREFIX = /usr/local |
|
USERDATADIR = /var/spool/incron |
|
SYSDATADIR = /etc/incron.d |
|
CFGDIR = /etc |
|
-MANPATH = /usr/share/man |
|
+MANPATH = $(PREFIX)/share/man |
|
RELEASE = incron-`cat VERSION` |
|
RELEASEDIR = /tmp/$(RELEASE) |
|
+DOCDIR = $(PREFIX)/share/doc/$(RELEASE)/ |
|
|
|
USER = root |
|
|
|
-CXX = g++ |
|
+CXX ?= g++ |
|
INSTALL = install |
|
|
|
OPTIMIZE = -O2 |
|
@@ -17,8 +17,8 @@ DEBUG = -g0 |
|
WARNINGS = -Wall |
|
CXXAUX = -pipe |
|
|
|
-CXXFLAGS = $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX) |
|
-LDFLAGS = $(WARNINGS) |
|
+CXXFLAGS ?= $(OPTIMIZE) $(DEBUG) $(CXXAUX) |
|
+CXXFLAGS += $(WARNINGS) |
|
|
|
PROGRAMS = incrond incrontab |
|
|
|
@@ -29,10 +29,10 @@ INCRONTAB_OBJ = ict-main.o incrontab.o inotify-cxx.o strtok.o incroncfg.o apparg |
|
all: $(PROGRAMS) |
|
|
|
incrond: $(INCROND_OBJ) |
|
- $(CXX) $(LDFLAGS) -o $@ $(INCROND_OBJ) |
|
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCROND_OBJ) |
|
|
|
incrontab: $(INCRONTAB_OBJ) |
|
- $(CXX) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ) |
|
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ) |
|
|
|
.cpp.o: |
|
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< |
|
@@ -44,33 +44,34 @@ clean: |
|
distclean: clean |
|
|
|
install: all install-man |
|
- [ -d $(PREFIX) ] |
|
- $(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/ |
|
- $(INSTALL) -m 0755 incrond $(PREFIX)/sbin/ |
|
- $(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR) |
|
- $(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR) |
|
- $(INSTALL) -m 0644 -o $(USER) incron.conf.example $(CFGDIR) |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin/ |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/sbin/ |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/ |
|
+ $(INSTALL) -m 04755 -o $(USER) incrontab $(DESTDIR)$(PREFIX)/bin/ |
|
+ $(INSTALL) -m 0755 incrond $(DESTDIR)$(PREFIX)/sbin/ |
|
+ $(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(USERDATADIR) |
|
+ $(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(SYSDATADIR) |
|
+ $(INSTALL) -m 0644 incron.conf.example $(DESTDIR)$(DOCDIR)/ |
|
|
|
install-man: incrontab.1 incrontab.5 incrond.8 incron.conf.5 |
|
- $(INSTALL) -m 0755 -d $(MANPATH)/man1 |
|
- $(INSTALL) -m 0755 -d $(MANPATH)/man5 |
|
- $(INSTALL) -m 0755 -d $(MANPATH)/man8 |
|
- $(INSTALL) -m 0644 incrontab.1 $(MANPATH)/man1 |
|
- $(INSTALL) -m 0644 incrontab.5 $(MANPATH)/man5 |
|
- $(INSTALL) -m 0644 incrond.8 $(MANPATH)/man8 |
|
- $(INSTALL) -m 0644 incron.conf.5 $(MANPATH)/man5 |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man1 |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man5 |
|
+ $(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man8 |
|
+ $(INSTALL) -m 0644 incrontab.1 $(DESTDIR)$(MANPATH)/man1 |
|
+ $(INSTALL) -m 0644 incrontab.5 $(DESTDIR)$(MANPATH)/man5 |
|
+ $(INSTALL) -m 0644 incrond.8 $(DESTDIR)$(MANPATH)/man8 |
|
+ $(INSTALL) -m 0644 incron.conf.5 $(DESTDIR)$(MANPATH)/man5 |
|
|
|
uninstall: uninstall-man |
|
- [ -d $(PREFIX) ] |
|
- rm -f $(PREFIX)/bin/incrontab |
|
- rm -f $(PREFIX)/sbin/incrond |
|
- rm -f $(CFGDIR)/incron.conf.example |
|
+ rm -f $(DESTDIR)$(PREFIX)/bin/incrontab |
|
+ rm -f $(DESTDIR)$(PREFIX)/sbin/incrond |
|
+ rm -rf $(DESTDIR)$(DOCDIR)/ |
|
|
|
uninstall-man: |
|
- rm -f $(MANPATH)/man1/incrontab.1 |
|
- rm -f $(MANPATH)/man5/incrontab.5 |
|
- rm -f $(MANPATH)/man8/incrond.8 |
|
- rm -f $(MANPATH)/man5/incron.conf.5 |
|
+ rm -f $(DESTDIR)$(MANPATH)/man1/incrontab.1 |
|
+ rm -f $(DESTDIR)$(MANPATH)/man5/incrontab.5 |
|
+ rm -f $(DESTDIR)$(MANPATH)/man8/incrond.8 |
|
+ rm -f $(DESTDIR)$(MANPATH)/man5/incron.conf.5 |
|
|
|
update: uninstall install |
|
|
|
-- |
|
1.7.3.4 |
|
|
|
|