diff -Naur gnome-print-0.36.old/Makefile.in gnome-print-0.36.new/Makefile.in --- gnome-print-0.36.old/Makefile.in Mon Jun 3 01:44:47 2002 +++ gnome-print-0.36.new/Makefile.in Sat Jun 8 17:48:30 2002 @@ -159,7 +159,7 @@ @LIBGPA_TRUE@LIBGPA_DIR = @LIBGPA_TRUE@libgpa data @LIBGPA_FALSE@LIBGPA_DIR = -SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests $(INSTALLER_DIR) +SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts $(INSTALLER_DIR) INCLUDES = \ $(GTK_CFLAGS) \ @@ -207,7 +207,7 @@ TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = intl po libgpa data libgnomeprint afms profiles fonts \ -tests installer +installer all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) diff -Naur gnome-print-0.36.old/configure gnome-print-0.36.new/configure --- gnome-print-0.36.old/configure Mon Jun 3 01:44:20 2002 +++ gnome-print-0.36.new/configure Sat Jun 8 21:15:06 2002 @@ -3440,11 +3440,11 @@ ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-undefined suppress -flat_namespace' # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclc.c gnome-print-0.36.new/libgnomeprint/gnome-print-pclc.c --- gnome-print-0.36.old/libgnomeprint/gnome-print-pclc.c Sun Jul 23 04:59:09 2000 +++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclc.c Sat Jun 8 17:48:30 2002 @@ -16,6 +16,8 @@ 4. The application and the print dialog will load the job specific parameters */ +PCLJobData * jobdata; + void pclc_new_job_data (void) { diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclr.c gnome-print-0.36.new/libgnomeprint/gnome-print-pclr.c --- gnome-print-0.36.old/libgnomeprint/gnome-print-pclr.c Fri May 25 05:35:07 2001 +++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclr.c Sat Jun 8 17:48:30 2002 @@ -62,7 +62,6 @@ #include #include -PCLJobData * jobdata; static GnomePrintRGBPClass *pclr_parent_class; static int diff -Naur gnome-print-0.36.old/libgnomeprint/gnome-print-pclv.c gnome-print-0.36.new/libgnomeprint/gnome-print-pclv.c --- gnome-print-0.36.old/libgnomeprint/gnome-print-pclv.c Fri May 25 05:35:07 2001 +++ gnome-print-0.36.new/libgnomeprint/gnome-print-pclv.c Sat Jun 8 17:48:30 2002 @@ -53,7 +53,6 @@ #include #include -PCLJobData * jobdata; static GnomePrintRGBPClass *pclv_parent_class; static int diff -Naur gnome-print-0.36.old/ltmain.sh gnome-print-0.36.new/ltmain.sh --- gnome-print-0.36.old/ltmain.sh Mon Jun 3 01:44:16 2002 +++ gnome-print-0.36.new/ltmain.sh Sat Jun 8 18:17:19 2002 @@ -2858,6 +2858,11 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + if test "x$verstring" = "x0.0"; then + tmp_verstring= + else + tmp_verstring="$verstring" + fi eval cmds=\"$archive_cmds\" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' diff -Naur gnome-print-0.36.old/run-gnome-font-install gnome-print-0.36.new/run-gnome-font-install --- gnome-print-0.36.old/run-gnome-font-install Tue Jan 15 00:43:06 2002 +++ gnome-print-0.36.new/run-gnome-font-install Sat Jun 8 17:48:30 2002 @@ -10,7 +10,7 @@ my $datadir = $ARGV[1]; my $srcdir = $ARGV[2]; my $sysconfdir = $ARGV[3]; -if (!$sysconfdir) {$sysconfdir="/etc";} +if (!$sysconfdir) {$sysconfdir="/etc";} die "Error: installer not executable.\n" unless -f $installer && -x $installer; die "Error: datadir is not a directory.\n" unless -d $datadir; @@ -26,6 +26,10 @@ '/usr/local/lib/ghostscript/fonts', '/usr/local/share/fonts/default/Type1', '/usr/local/share/fonts/default/ghostscript', + '/share/ghostscript/fonts', + '/lib/ghostscript/fonts', + '/share/fonts/default/Type1', + '/share/fonts/default/ghostscript', '/usr/share/ghostscript/fonts', '/usr/freeware/share/ghostscript/fonts' ); @@ -148,7 +152,13 @@ '/usr/lib/texmf/fonts/type1/omega', '/usr/share/texmf/fonts/afm', '/usr/share/texmf/fonts/type1/adobe', - '/usr/share/texmf/fonts/type1/omega' + '/usr/share/texmf/fonts/type1/omega', + '/lib/texmf/fonts/afm', + '/lib/texmf/fonts/type1/adobe', + '/lib/texmf/fonts/type1/omega', + '/share/texmf/fonts/afm', + '/share/texmf/fonts/type1/adobe', + '/share/texmf/fonts/type1/omega' ); print "Info: running \"$installer ", join (' ', @options), "\".\n"; system ($installer, @options);