updates.

diff --git a/CHANGES b/CHANGES
index c80e8e207cf57cffed4f11639c413c00da30dc98..43771b479d3fcab728b60bd1151548f05898e447 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Sun Jun  3 14:00:09 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed DESTDIR handling in make install.
+
 Sat Jun  2 21:04:32 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * SIM modules are not delivered to SILC CLient distribution

diff --git a/Makefile.defines_int.in b/Makefile.defines_int.in
index 36df88bc1fa1a7fe2e40cfcff7625731ae414c99..8d639153c575d373b8e57a9bed8c4e411996137f 100644 (file)
--- a/Makefile.defines_int.in
+++ b/Makefile.defines_int.in
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2007 Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -49,10 +49,12 @@ silc_etcdir=@ETCDIR@
 silc_modulesdir=@MODULESDIR@
 silc_helpdir=@HELPDIR@
 silc_docdir=@DOCDIR@
-silc_logsdir=@LOGSDIR@
 etcdir = $(DESTDIR)$(silc_etcdir)
 modulesdir = $(DESTDIR)$(silc_modulesdir)
 helpdir = $(DESTDIR)$(silc_helpdir)
 docdir = $(DESTDIR)$(silc_docdir)
-logsdir = $(DESTDIR)$(silc_logsdir)
 mandir = $(DESTDIR)@mandir@
+#ifdef SILC_DIST_SERVER
+silc_logsdir=@LOGSDIR@
+logsdir = $(DESTDIR)$(silc_logsdir)
+#endif SILC_DIST_SERVER
\ No newline at end of file

diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 922fab3d4c64ce465c2fb276d4b67a60f4b5228e..12acfaffcdb45239d6096d1f1e1e31c17a3f5fad 100644 (file)
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(src)
+AC_INIT([SILC-Client], [0.8.11+], [silc-devel@lists.silcnet.org], [silc-client])
 
 # we don't want VERSION in our config.h
 if test -n "`grep '^#undef VERSION' config.h.in`"; then
@@ -7,7 +7,7 @@ if test -n "`grep '^#undef VERSION' config.h.in`"; then
 fi
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(SILC-Client, 0.8.11+)
+AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE
 

diff --git a/apps/irssi/docs/Makefile.am b/apps/irssi/docs/Makefile.am
index e2ff29c3e40860f7658aa2fb1cd0fa3ac50d283c..b40f1575d23fa37f903da674ebceb9e38fd64e9f 100644 (file)
--- a/apps/irssi/docs/Makefile.am
+++ b/apps/irssi/docs/Makefile.am
@@ -1,11 +1,6 @@
-include $(top_srcdir)/Makefile.defines.in
-
-docdir = $(silc_docdir)
 
 doc_DATA = signals.txt formats.txt manual.txt startup-HOWTO.html \
        special_vars.txt
-#      faq.txt
-#      startup-HOWTO.txt
 
 EXTRA_DIST = $(doc_DATA)
 

diff --git a/apps/irssi/silc-client.spec.in b/apps/irssi/silc-client.spec.in
index 41a481198c01502262e7e451fbe93c3b8833a96a..962bb4b10044319124e4af929f689d881f75634d 100644 (file)
--- a/apps/irssi/silc-client.spec.in
+++ b/apps/irssi/silc-client.spec.in
@@ -15,11 +15,6 @@ SILC (Secure Internet Live Conferencing) is a protocol which provides
 secure conferencing services on the Internet over insecure channel.
 SILC Client is used to connect to SILC server and SILC network.
 
-# Need this because the irssi's configure we run from silc-client
-# configure somehow installs some of the files to location where I don't
-# know how to reach them.
-%define _unpackaged_files_terminate_build 0
-
 %prep
 %setup -q
 
@@ -36,21 +31,22 @@ make -j4
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/5.6.0/i386-linux/perllocal.pod
-rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/silc-client
+rm -f $RPM_BUILD_ROOT/%{_libdir}/silc/perl5/*/perllocal.pod
+mv $RPM_BUILD_ROOT/%{_datadir}/doc/silc-client \
+  $RPM_BUILD_ROOT/%{_datadir}/doc/silc-client-%version
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-,root,root,-)
+%defattr (755,root,root,755)
 %{_bindir}/*
 %{_libdir}/silc/perl5
+%defattr (644,root,root,755)
 %{_sysconfdir}/silc.conf
 %{_mandir}/man1/*
 %{_datadir}/silc
-%doc CHANGES COPYING CREDITS README README.PLUGIN TODO doc/FAQ
-%doc apps/irssi/docs/*.txt apps/irssi/docs/*.html
+%doc %{_datadir}/doc
 
 %changelog
 * Sun Jun  3 2007 - Pekka Riikonen <priikone@silcnet.org>

diff --git a/lib/configure.ad b/lib/configure.ad
index 4cd72074af310defbae37ae8367037a5f697bc70..88d674f89b3e3da929000eff749bf1e9d1160185 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -133,10 +133,10 @@ AC_CHECK_FUNC(epoll_wait,
     )
   ])
 
+MODULESDIR="$silc_prefix/modules"
 #ifdef SILC_DIST_SIM
 # SIM modules directory
 #
-MODULESDIR="$silc_prefix/modules"
 AC_ARG_WITH(simdir,
   [[  --with-simdir=DIR       directory for SIM modules [PREFIX/modules]]],
   [
@@ -148,9 +148,9 @@ AC_ARG_WITH(simdir,
         ;;
     esac
   ])
-AC_SUBST(MODULESDIR)
 AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
 #endif SILC_DIST_SIM
+AC_SUBST(MODULESDIR)
 
 #ifdef SILC_DIST_TOOLKIT
 # Stack trace checking