This is nowhere near perfect.
* looking for [EMAIL PROTECTED]/archzoom--devel--0--patch-276 to compare with
* comparing to [EMAIL PROTECTED]/archzoom--devel--0--patch-276
..........
* modified files
--- orig/Makefile
+++ mod/Makefile.am
@@ -1,4 +1,7 @@
-# There are plans to move to auto tools, this Makefile will work for now.
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = perllib
+
+homedir = @homedir@
DocumentRoot = /should/be/set/or/autodetected
UseSymlinks = 0
--- orig/perllib/ArchZoom.pm
+++ mod/perllib/ArchZoom.pm.in
@@ -28,7 +28,7 @@
use vars qw($VERSION $VERSIONINFO $DataDir $ConfigFile %Config);
BEGIN {
- $VERSION = '0.4.3';
+ $VERSION = '@PACKAGE_VERSION@';
$VERSIONINFO = ' (devel)';
}
@@ -38,11 +38,12 @@
BEGIN {
my $dir = $FindBin::Bin || ".";
$DataDir =
+ -d "@datadir@/archzoom" ? "@datadir@/archzoom":
-d "$dir/archzoom-data"? "$dir/archzoom-data":
-d "$dir/../archzoom-data"? "$dir/../archzoom-data":
-d "$dir/../../archzoom-data"? "$dir/../../archzoom-data":
"$dir/..";
- $ConfigFile ||= "$DataDir/conf/archzoom.conf";
+ $ConfigFile ||= "@sysconfdir@/archzoom.conf";
# default config if archzoom.conf is not found
%Config = (
@@ -68,7 +69,7 @@
abrowse_compact => 0,
abrowse_transpose => 0,
abrowse_transpose_changeable => 1,
- template_dir => "templates",
+ template_dir => "@datadir@/archzoom/templates",
template_set => "default",
layout_css => "default",
color_css => "default",
@@ -77,7 +78,7 @@
fallback_revision_library => "",
auto_temp_trees => 1,
arch_backend => "",
- home_dir => $ENV{HOME} || "",
+ home_dir => $ENV{HOME} || "@homedir@",
unix_path => $ENV{PATH} || "",
temp_dir => "/tmp",
error_file => -e "/dev/null"? "/dev/null": "",
@@ -85,7 +86,7 @@
tarball_downloading => 0,
run_limit_number => 0,
run_limit_timeout => 0,
- run_limit_file => "",
+ run_limit_file => "@localstatedir@/archzoom-run-limit",
cache_dir => "",
archives_cache => "",
globcats_cache => "",
@@ -123,7 +124,7 @@
sub apply_config_immediately () {
# the logic is touchy, try to work in all cases
$ENV{HOME} = $Config{'home_dir'} if $Config{'home_dir'};
- $ENV{HOME} = "" unless $ENV{HOME} && -d $ENV{HOME};
+ $ENV{HOME} = "@homedir@" unless $ENV{HOME} && -d $ENV{HOME};
# try to autodetect $HOME
unless ($ENV{HOME}) {
* added files
--- /dev/null
+++ mod/.arch-ids/configure.ac.id
@@ -0,0 +1 @@
+Clint Adams <[EMAIL PROTECTED]> Sun Mar 27 14:39:56 2005 675.0
--- /dev/null
+++ mod/configure.ac
@@ -0,0 +1,11 @@
+AC_INIT([ArchZoom],[0.4.3],[EMAIL PROTECTED],[archzoom])
+AC_PREREQ(2.59)
+AM_INIT_AUTOMAKE
+
+AC_ARG_WITH([homedir],
+ AS_HELP_STRING([--with-homedir], [default homedir]),
+ [homedir=$withval], [homedir=""])
+AC_SUBST(homedir)
+
+AC_CONFIG_FILES(Makefile perllib/Makefile)
+AC_OUTPUT
--- /dev/null
+++ mod/perllib/.arch-ids/Makefile.am.id
@@ -0,0 +1 @@
+Clint Adams <[EMAIL PROTECTED]> Sun Mar 27 15:44:20 2005 15636.0
--- /dev/null
+++ mod/perllib/Makefile.am
@@ -0,0 +1,14 @@
+AUTOMAKE_OPTIONS=foreign
+EXTRA_DIST = ArchZoom.pm.in
+CLEANFILES = ArchZoom.pm
+nodist_data_DATA = ArchZoom.pm
+
+do_subst = sed -e 's,[EMAIL PROTECTED]@],$(PACKAGE_VERSION),g' \
+ -e 's,[EMAIL PROTECTED]@],'`echo $(bindir)`',g' \
+ -e 's,[EMAIL PROTECTED]@],'`echo $(datadir)`',g' \
+ -e 's,[EMAIL PROTECTED]@],'`echo $(localstatedir)`',g' \
+ -e 's,[EMAIL PROTECTED]@],'`echo $(sysconfdir)`',g' \
+ -e 's,[EMAIL PROTECTED]@],'`echo $(homedir)`',g'
+
+ArchZoom.pm: $(srcdir)/ArchZoom.pm.in Makefile
+ $(do_subst) < $(srcdir)/ArchZoom.pm.in > ArchZoom.pm
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
