diff -ur open-xchange.0.7.1-orig/Makefile.am open-xchange.0.7.1/Makefile.am --- open-xchange.0.7.1-orig/Makefile.am 2004-09-03 07:30:11.000000000 -0700 +++ open-xchange.0.7.1/Makefile.am 2004-09-03 12:02:09.852980768 -0700 @@ -1,5 +1,5 @@ SUBDIRS = javabuild src -clean: @sslsubdir@ +clean: ${D}@sslsubdir@ @ANT@ clean misc: @@ -10,33 +10,35 @@ rm src/misc/ssl/com_openexchange_ssl_SSLSocket.h install: - $(mkinstalldirs) @bindir@ - $(mkinstalldirs) @sbindir@ - $(mkinstalldirs) @datadir@ - $(mkinstalldirs) @datadir@/images - $(mkinstalldirs) @datadir@/sound - $(mkinstalldirs) @datadir@/misc - $(mkinstalldirs) @datadir@/servlets - $(mkinstalldirs) @datadir@/perl - $(mkinstalldirs) @oxgroupwarehtmldir@ - $(mkinstalldirs) @oxwebmailhtmldir@ - $(mkinstalldirs) @sysconfdir@ - $(mkinstalldirs) @sysconfdir@/groupware - $(mkinstalldirs) @sysconfdir@/webmail - $(mkinstalldirs) @sysconfdir@/init.d - $(mkinstalldirs) @sysconfdir@/groupware/CERT - $(mkinstalldirs) @localstatedir@ - $(mkinstalldirs) @localstatedir@/log - $(mkinstalldirs) @localstatedir@/settings/intranet - $(mkinstalldirs) @localstatedir@/settings/webmail - $(mkinstalldirs) @localstatedir@/filespool - $(mkinstalldirs) @localstatedir@/drafts - $(mkinstalldirs) @localstatedir@/webmailupload - $(mkinstalldirs) @localstatedir@/dictionary - $(mkinstalldirs) @libdir@ - $(mkinstalldirs) @includedir@ - $(mkinstalldirs) @infodir@ - $(mkinstalldirs) @mandir@ + $(mkinstalldirs) ${D}@bindir@ + $(mkinstalldirs) ${D}@sbindir@ + $(mkinstalldirs) ${D}@datadir@/open-xchange/ + $(mkinstalldirs) ${D}@datadir@/open-xchange/images + $(mkinstalldirs) ${D}@datadir@/open-xchange/sound + $(mkinstalldirs) ${D}@datadir@/open-xchange/misc + $(mkinstalldirs) ${D}@datadir@/open-xchange/servlets + $(mkinstalldirs) ${D}@datadir@/open-xchange/perl + $(mkinstalldirs) ${D}@datadir@/open-xchange/groupware + $(mkinstalldirs) ${D}@datadir@/open-xchange/groupware/data + $(mkinstalldirs) ${D}@datadir@/open-xchange/webmail + $(mkinstalldirs) ${D}@datadir@/open-xchange/webmail/data + $(mkinstalldirs) ${D}@sysconfdir@/init.d/ + $(mkinstalldirs) ${D}@sysconfdir@/open-xchange/ + $(mkinstalldirs) ${D}@sysconfdir@/open-xchange/groupware + $(mkinstalldirs) ${D}@sysconfdir@/open-xchange/webmail + $(mkinstalldirs) ${D}@sysconfdir@/open-xchange/groupware/CERT + $(mkinstalldirs) ${D}@localstatedir@/open-xchange + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/log + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/settings/intranet + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/settings/webmail + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/filespool + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/drafts + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/webmailupload + $(mkinstalldirs) ${D}@localstatedir@/open-xchange/dictionary + $(mkinstalldirs) ${D}@libdir@ + $(mkinstalldirs) ${D}@includedir@ + $(mkinstalldirs) ${D}@infodir@ + $(mkinstalldirs) ${D}@mandir@ chmod 755 bin/groupware/openexchange-groupware chmod 755 bin/groupware/openexchange-sessiond chmod 755 bin/webmail/openexchange-webmail @@ -60,63 +62,63 @@ chmod 755 system/etc/init.d/webmail chmod 755 system/etc/init.d/sessiond chmod 755 system/etc/init.d/openexchange - chown -R @runuid@.@rungid@ @localstatedir@ - cp bin/groupware/openexchange-groupware @bindir@/. - cp bin/groupware/openexchange-sessiond @bindir@/. - cp bin/webmail/openexchange-webmail @bindir@/. - cp sbin/addgroup_ox @sbindir@/. - cp sbin/addresource_ox @sbindir@/. - cp sbin/addresourcegroup_ox @sbindir@/. - cp sbin/addresourcetogroup_ox @sbindir@/. - cp sbin/adduser_ox @sbindir@/. - cp sbin/addusersql_ox @sbindir@/. - cp sbin/addusertogroup_ox @sbindir@/. - cp sbin/changeuserattr_ox @sbindir@/. - cp sbin/delgroup_ox @sbindir@/. - cp sbin/delresource_ox @sbindir@/. - cp sbin/delresourcefromgroup_ox @sbindir@/. - cp sbin/delresourcegroup_ox @sbindir@/. - cp sbin/deluser_ox @sbindir@/. - cp sbin/deluserfromgroup_ox @sbindir@/. - cp sbin/correctfilespool @sbindir@/. - cp -r system/setup/* @datadir@/. - cp -r system/etc/cron.d/ @sysconfdir@/. - cp system/etc/init.d/groupware @sysconfdir@/init.d/. - cp system/etc/init.d/sessiond @sysconfdir@/init.d/. - cp system/etc/init.d/webmail @sysconfdir@/init.d/. - cp system/etc/init.d/openexchange @sysconfdir@/init.d/. - cp conf/admintools.conf @sysconfdir@/. - cp conf/initscript.conf @sysconfdir@/. - cp conf/groupware/nasi.conf @sysconfdir@/groupware/. - cp conf/groupware/calendar @sysconfdir@/groupware/. - cp conf/groupware/currencyformat @sysconfdir@/groupware/. - cp conf/groupware/dateformat @sysconfdir@/groupware/. - cp conf/groupware/external.conf @sysconfdir@/groupware/. - cp conf/groupware/forum @sysconfdir@/groupware/. - cp conf/groupware/intranet.conf @sysconfdir@/groupware/. - cp conf/groupware/ldap.properties @sysconfdir@/groupware/. - cp conf/groupware/server.conf @sysconfdir@/groupware/. - cp conf/groupware/system.properties @sysconfdir@/groupware/. - cp conf/groupware/tasks @sysconfdir@/groupware/. - cp -r conf/groupware/locales @sysconfdir@/groupware/. - cp -r conf/groupware/METADB @sysconfdir@/groupware/. - cp conf/webmail/flags.cfg @oxwebmailsysconfdir@/. - cp conf/webmail/system.properties @oxwebmailsysconfdir@/. - cp conf/webmail/nasi.conf @oxwebmailsysconfdir@/. - cp conf/webmail/server.conf @oxwebmailsysconfdir@/. - cp conf/webmail/spellcheck.cfg @oxwebmailsysconfdir@/. - cp conf/webmail/system.cfg @oxwebmailsysconfdir@/. - cp conf/webmail/system.properties @oxwebmailsysconfdir@/. - cp -r conf/webmail/locales @oxwebmailsysconfdir@/. - cp -r groupware/* @oxgroupwarehtmldir@/. - cp -r webmail/* @oxwebmailhtmldir@/. - cp -r system/www/groupware/* @datadir@/groupware/data/. - cp -r system/www/webmail/* @datadir@/webmail/data/. - cp lib/* @libdir@/ - if test -f src/misc/ssl/.libs/liboxssl.so ; then cp src/misc/ssl/.libs/liboxssl.so @libdir@/. ; fi + chown -R @runuid@:@rungid@ ${D}@localstatedir@/open-xchange + cp bin/groupware/openexchange-groupware ${D}@bindir@/ + cp bin/groupware/openexchange-sessiond ${D}@bindir@/ + cp bin/webmail/openexchange-webmail ${D}@bindir@/ + cp sbin/addgroup_ox ${D}@sbindir@/ + cp sbin/addresource_ox ${D}@sbindir@/ + cp sbin/addresourcegroup_ox ${D}@sbindir@/ + cp sbin/addresourcetogroup_ox ${D}@sbindir@/ + cp sbin/adduser_ox ${D}@sbindir@/ + cp sbin/addusersql_ox ${D}@sbindir@/ + cp sbin/addusertogroup_ox ${D}@sbindir@/ + cp sbin/changeuserattr_ox ${D}@sbindir@/ + cp sbin/delgroup_ox ${D}@sbindir@/ + cp sbin/delresource_ox ${D}@sbindir@/ + cp sbin/delresourcefromgroup_ox ${D}@sbindir@/ + cp sbin/delresourcegroup_ox ${D}@sbindir@/ + cp sbin/deluser_ox ${D}@sbindir@/ + cp sbin/deluserfromgroup_ox ${D}@sbindir@/ + cp sbin/correctfilespool ${D}@sbindir@/ + cp -r system/setup/* ${D}@datadir@/open-xchange/ + cp -r system/etc/cron.d/ ${D}@datadir@/open-xchange/ + cp system/etc/init.d/groupware ${D}/etc/init.d/ + cp system/etc/init.d/webmail ${D}/etc/init.d/ + cp system/etc/init.d/sessiond ${D}/etc/init.d/ + cp system/etc/init.d/openexchange ${D}/etc/init.d/ + cp conf/admintools.conf ${D}@sysconfdir@/open-xchange/ + cp conf/initscript.conf ${D}@sysconfdir@/open-xchange/ + cp conf/groupware/nasi.conf ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/calendar ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/currencyformat ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/dateformat ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/external.conf ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/forum ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/intranet.conf ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/ldap.properties ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/server.conf ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/system.properties ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/groupware/tasks ${D}@sysconfdir@/open-xchange/groupware/ + cp -r conf/groupware/locales ${D}@sysconfdir@/open-xchange/groupware/ + cp -r conf/groupware/METADB ${D}@sysconfdir@/open-xchange/groupware/ + cp conf/webmail/flags.cfg ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/system.properties ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/nasi.conf ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/server.conf ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/spellcheck.cfg ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/system.cfg ${D}@sysconfdir@/open-xchange/webmail/ + cp conf/webmail/system.properties ${D}@sysconfdir@/open-xchange/webmail/ + cp -r conf/webmail/locales ${D}@sysconfdir@/open-xchange/webmail/ + cp -r groupware/* ${D}@datadir@/open-xchange/groupware/ + cp -r webmail/* ${D}@datadir@/open-xchange/webmail/ + cp -r system/www/groupware/* ${D}@datadir@/open-xchange/groupware/data/ + cp -r system/www/webmail/* ${D}@datadir@/open-xchange/webmail/data/ + cp lib/* ${D}@libdir@/ + if test -f src/misc/ssl/.libs/liboxssl.so ; then cp src/misc/ssl/.libs/liboxssl.so ${D}@libdir@/ ; fi chmod 755 src/misc/login/login.pl - cp src/misc/login/login.pl @datadir@/perl/. - cp src/misc/login/login.pm @datadir@/perl/. - cp build/intranet.class @datadir@/servlets/. - cp build/webmail.class @datadir@/servlets/. + cp src/misc/login/login.pl ${D}@datadir@/open-xchange/perl/ + cp src/misc/login/login.pm ${D}@datadir@/open-xchange/perl/ + cp build/intranet.class ${D}@datadir@/open-xchange/servlets/ + cp build/webmail.class ${D}@datadir@/open-xchange/servlets/