From d959e311f0efff5772201b6edaf721050e188261 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Thu, 28 Dec 2006 15:18:51 +0000 Subject: [PATCH] * replaced $(root) in make file with standart name $(DESTDIR) * one more ical dependanyc rename * removed unneded dependencies. thanks to fabo. --- citadel/Makefile.in | 116 ++++++++++++------------ citadel/debian/citadel-server.substvars | 2 +- citadel/debian/control | 2 +- citadel/debian/rules | 4 +- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index e7562db07..436d97390 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -205,120 +205,120 @@ upgrade: install-exec install-doc install-data: @for i in help messages network/spoolin network/spoolout \ network/systems; do \ - $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done @for i in citadel.rc public_clients \ `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ done - -@if test -d $(root)/etc/pam.d; then \ - echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ - $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ + -@if test -d $(DESTDIR)/etc/pam.d; then \ + echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ + $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ fi install-data-new: @for i in network/spoolin network/spoolout network/systems; do \ - $(srcdir)/mkinstalldirs $(root)$(RUN_DIR)/$$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \ done - $(srcdir)/mkinstalldirs $(root)$(ETC_DIR)/ - $(INSTALL_DATA) $(srcdir)/public_clients $(root)$(ETC_DIR)/public_clients - $(INSTALL_DATA) $(srcdir)/citadel.rc $(root)$(ETC_DIR)/citadel.rc - $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(root)$(ETC_DIR)/mail.aliases$ + $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/ + $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients + $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc + $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$ - $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/help - $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/messages + $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/help + $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/messages @for i in \ `find $(srcdir)/help $(srcdir)/messages -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(DATA_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(DATA_DIR)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(DATA_DIR)/$$i; \ done - $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/spoolin - $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/spoolout - $(srcdir)/mkinstalldirs $(root)$(SPOOL_DIR)/network/systems - -@if test -d $(root)/etc/pam.d; then \ - echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ - $(INSTALL_DATA) $(srcdir)/citadel.pam $(root)/etc/pam.d/citadel; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin + $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout + $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/systems + -@if test -d $(DESTDIR)/etc/pam.d; then \ + echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ + $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ fi @for i in bio bitbucket files images info userpics; do \ - $(srcdir)/mkinstalldirs $(root)$(DATA_DIR)/$$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \ done install-doc: - @$(srcdir)/mkinstalldirs $(root)$(prefix)/docs + @$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/docs @for i in `find $(srcdir)/docs -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ done - @$(srcdir)/mkinstalldirs $(root)$(prefix)/techdoc + @$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/techdoc @for i in `find $(srcdir)/techdoc -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(prefix)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ done - echo $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt - $(INSTALL_DATA) README.txt $(root)$(prefix)/README.txt + echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt + $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt install-doc-new: - @$(srcdir)/mkinstalldirs $(root)$(DOC_DIR)/docs + @$(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR)/docs @for i in `find $(srcdir)/docs -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ done - @$(srcdir)/mkinstalldirs $(root)$(DOC_DIR)/techdoc + @$(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR)/techdoc @for i in `find $(srcdir)/techdoc -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(root)$(DOC_DIR)/$$i; \ + echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ done - $(INSTALL_DATA) README.txt $(root)$(DOC_DIR)/README.txt + $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt install-exec: all @for i in bio bitbucket files images info userpics; do \ - $(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS); do \ if test -f $$i; then \ - echo $(INSTALL) $$i $(root)$(prefix)/$$i; \ - $(INSTALL) $$i $(root)$(prefix)/$$i; \ + echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ + $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ fi \ done @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \ if test -f $(srcdir)/$$i; then \ - echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \ - $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \ + echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ + $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ fi \ done - @if test x`find $(root)$(prefix)/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \ - echo chmod u+s $(root)$(prefix)/chkpwd; \ - chmod u+s $(root)$(prefix)/chkpwd; \ + @if test x`find $(DESTDIR)$(prefix)/chkpwd -user root` = x$(DESTDIR)$(prefix)/chkpwd; then \ + echo chmod u+s $(DESTDIR)$(prefix)/chkpwd; \ + chmod u+s $(DESTDIR)$(prefix)/chkpwd; \ fi install-exec-new: all - $(srcdir)/mkinstalldirs $(root)/usr/sbin; - $(srcdir)/mkinstalldirs $(root)/usr/bin; - $(srcdir)/mkinstalldirs $(root)$(DOC_DIR); + $(srcdir)/mkinstalldirs $(DESTDIR)/usr/sbin; + $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin; + $(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR); @for i in $(SERVER_TARGETS) $(UTIL_TARGETS); do \ if test -f $$i; then \ - echo $(INSTALL) $$i $(root)/usr/sbin/$$i; \ - $(INSTALL) $$i $(root)/usr/sbin/$$i; \ + echo $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \ + $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \ fi \ done - $(INSTALL) citmail $(root)/usr/sbin/sendmail; + $(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail; @for i in $(CLIENT_TARGETS); do \ if test -f $$i; then \ - echo $(INSTALL) $$i $(root)/usr/bin/$$i; \ - $(INSTALL) $$i $(root)/usr/bin/$$i; \ + echo $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \ + $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \ fi \ done @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \ if test -f $(srcdir)/$$i; then \ - echo $(INSTALL) $(srcdir)/$$i $(root)$(DOC_DIR)/$$i; \ - $(INSTALL) $(srcdir)/$$i $(root)$(DOC_DIR)/$$i; \ + echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ + $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ fi \ done - @if test x`find $(root)/usr/sbin/chkpwd -user root` = x$(root)$(prefix)/chkpwd; then \ - echo chmod u+s $(root)/usr/sbin/chkpwd; \ - chmod u+s $(root)usr/sbin/chkpwd; \ + @if test x`find $(DESTDIR)/usr/sbin/chkpwd -user root` = x$(DESTDIR)$(prefix)/chkpwd; then \ + echo chmod u+s $(DESTDIR)/usr/sbin/chkpwd; \ + chmod u+s $(DESTDIR)usr/sbin/chkpwd; \ fi clean: diff --git a/citadel/debian/citadel-server.substvars b/citadel/debian/citadel-server.substvars index 8e416c9ca..2e567edcc 100644 --- a/citadel/debian/citadel-server.substvars +++ b/citadel/debian/citadel-server.substvars @@ -1,2 +1,2 @@ misc:Depends=debconf (>= 0.5) | debconf-2.0 -shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libpam0g (>= 0.76), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libical0, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libpam0g (>= 0.76), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1) diff --git a/citadel/debian/control b/citadel/debian/control index afd535073..2aa041ed0 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -2,7 +2,7 @@ Source: citadel Section: mail Priority: optional Maintainer: Wilfried Goesgens -Build-Depends: debhelper (>= 4.0.0), libical0-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.4-dev|libdb4.3-dev, libldap2-dev, bison, libpam0g-dev, libsieve2-dev +Build-Depends: debhelper (>= 4.0.0), libical-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.4-dev|libdb4.3-dev, libldap2-dev, bison, libpam0g-dev, libsieve2-dev Standards-Version: 3.6.1 Package: citadel-server diff --git a/citadel/debian/rules b/citadel/debian/rules index 5d17047f1..3f19dc5bf 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -86,7 +86,7 @@ install-indep: dh_testroot dh_clean -k -i dh_installdirs -i - export root=$(CURDIR)/debian/tmp; $(MAKE) install-doc-new prefix=$(CURDIR)/debian/citadel-doc/ + $(MAKE) -C . install DESTDIR="$(CURDIR)/debian/tmp" install-doc-new prefix=$(CURDIR)/debian/citadel-doc/ install-arch: @@ -95,7 +95,7 @@ install-arch: dh_clean -k -s dh_installdirs -s mkdir -p $(CURDIR)/debian/tmp/ - export root=$(CURDIR)/debian/tmp/;$(MAKE) install-exec-new install-data-new + $(MAKE) -C . install DESTDIR="$(CURDIR)/debian/tmp/" install-exec-new install-data-new mkdir -p $(CURDIR)/debian/tmp/usr/lib/citadel-server mv \ -- 2.39.2