diff options
| author | radzio | 2003-06-26 19:14:03 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 4cd1bf2b650e799e7f02a72f73a5fa0a4c6c7143 (patch) | |
| tree | c9504977f6dd8ebb9f26445bcc1daa5a2c640405 | |
| parent | 4f6658ebf695cdeaadd4e7b6f12750daea2241ff (diff) | |
| download | partysip-4cd1bf2b650e799e7f02a72f73a5fa0a4c6c7143.zip partysip-4cd1bf2b650e799e7f02a72f73a5fa0a4c6c7143.tar.gz | |
- 0.6.0
Changed files:
partysip-DESTDIR_fix.patch -> 1.2
| -rw-r--r-- | partysip-DESTDIR_fix.patch | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/partysip-DESTDIR_fix.patch b/partysip-DESTDIR_fix.patch index 42c73f9..1a45541 100644 --- a/partysip-DESTDIR_fix.patch +++ b/partysip-DESTDIR_fix.patch @@ -1,35 +1,29 @@ ---- ./conf/Makefile.am.org Sat Dec 28 01:50:58 2002 -+++ ./conf/Makefile.am Thu Jan 2 09:59:46 2003 -@@ -1,27 +1,25 @@ - EXTRA_DIST = partysip.conf - --sysconfdir = $(prefix)/etc/partysip/ -- +diff -Naur partysip-0.6.0.orig/conf/Makefile.am partysip-0.6.0/conf/Makefile.am +--- partysip-0.6.0.orig/conf/Makefile.am Thu Jun 26 20:39:46 2003 ++++ partysip-0.6.0/conf/Makefile.am Thu Jun 26 20:45:06 2003 +@@ -3,23 +3,8 @@ pkgdatadir = $(prefix)/$(PACKAGE) install-data-local: -- $(mkinstalldirs) $(sysconfdir); -- @chmod 0755 $(sysconfdir); -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir); -+ @chmod 0755 $(DESTDIR)$(sysconfdir); +- $(mkinstalldirs) $(CONFIG_DIR); +- @chmod 0755 $(CONFIG_DIR); ++ $(mkinstalldirs) $(DESTDIR)/$(CONFIG_DIR); @echo "Installing admin files : partysip.conf"; -- @if test -f $(sysconfdir)partysip.conf; then \ -+ @if test -f $(DESTDIR)$(sysconfdir)partysip.conf; then \ - echo "********************************************************"; \ - echo "**** File partysip.conf has already been installed. ****"; \ - echo "**** MERGE CHANGES MANUALLY in partysip.conf. ****"; \ - echo "********************************************************"; \ - echo "Installing new admin file: partysip.conf.$(PSP_VERSION)"; \ - echo "********************************************************"; \ -- $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(sysconfdir)partysip.conf.$(PSP_VERSION); \ -+ $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(DESTDIR)$(sysconfdir)partysip.conf.$(PSP_VERSION); \ - else \ - echo "********************************************************"; \ - echo "**** First installation detected. ****"; \ - echo "**** Please, edit the file partysip.conf. ****"; \ - echo "********************************************************"; \ -- $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(sysconfdir); \ -+ $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(DESTDIR)$(sysconfdir); \ - fi +- @if test -f $(CONFIG_DIR)/partysip.conf; then \ +- echo "********************************************************"; \ +- echo "**** File partysip.conf has already been installed. ****"; \ +- echo "**** MERGE CHANGES MANUALLY in partysip.conf. ****"; \ +- echo "********************************************************"; \ +- echo "Installing new admin file: partysip.conf.$(PSP_VERSION)"; \ +- echo "********************************************************"; \ +- $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(CONFIG_DIR)/partysip.conf.$(PSP_VERSION); \ +- else \ +- echo "********************************************************"; \ +- echo "**** First installation detected. ****"; \ +- echo "**** Please, edit the file partysip.conf. ****"; \ +- echo "********************************************************"; \ +- $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(CONFIG_DIR)/; \ +- fi ++ $(INSTALL_DATA) $(top_srcdir)/conf/partysip.conf $(DESTDIR)/$(CONFIG_DIR)/; |