- updated to 0.9.4

Changed files:
    emu10k1-utils-path.patch -> 1.2

diff --git a/emu10k1-utils-path.patch b/emu10k1-utils-path.patch
index cb1ece13da1ea636c92db995bb1e608232b483e9..7f089c14d1d3b52c7b5ef8614ba6fac783da79f4 100644 (file)
--- a/emu10k1-utils-path.patch
+++ b/emu10k1-utils-path.patch
@@ -1,22 +1,34 @@
-diff -ruN emu10k1-utilsdupa/Makefile.config emu10k1-utils/Makefile.config
---- emu10k1-utilsdupa/Makefile.config  Mon Aug 20 13:02:09 2001
-+++ emu10k1-utils/Makefile.config      Fri Jan  4 22:19:35 2002
+diff -ruN emu-tools-0.9.4aa/Makefile.config emu-tools-0.9.4/Makefile.config
+--- emu-tools-0.9.4aa/Makefile.config  Sun Jan 20 03:00:17 2002
++++ emu-tools-0.9.4/Makefile.config    Tue Jan 29 18:39:47 2002
 @@ -1,9 +1,9 @@
  
  #tools install defaults
  
--prefix := ${DESTDIR}/usr/local
+-prefix ?= ${DESTDIR}/usr/local
 +prefix := ${DESTDIR}/usr
  exec_prefix := $(prefix)
  bindir := $(exec_prefix)/bin
  data_dir := $(prefix)/share/emu10k1
 -man_prefix := $(exec_prefix)/man
 -script_dir := $(prefix)/etc
-+man_prefix := $(exec_prefix)/share/man
-+script_dir := ${DESTDIR}/etc
-diff -ruN emu10k1-utilsdupa/scripts/Makefile emu10k1-utils/scripts/Makefile
---- emu10k1-utilsdupa/scripts/Makefile Sun Aug 26 13:02:11 2001
-+++ emu10k1-utils/scripts/Makefile     Fri Jan  4 22:13:40 2002
++man_prefix := $(prefix)/share/man
++script_dir := $(DESTDIR)/etc
+diff -ruN emu-tools-0.9.4aa/epache-0.1.4/main.h emu-tools-0.9.4/epache-0.1.4/main.h
+--- emu-tools-0.9.4aa/epache-0.1.4/main.h      Wed Oct 24 06:14:28 2001
++++ emu-tools-0.9.4/epache-0.1.4/main.h        Tue Jan 29 18:40:00 2002
+@@ -25,7 +25,7 @@
+ #define DSPMGR "emu-dspmgr"
+ #define MAXFILENAME 32
+ #define MAXPATHLEN 4095
+-#define DIRWITHPATCHES "/usr/local/share/emu10k1/"
++#define DIRWITHPATCHES "/usr/share/emu10k1/"
+ 
+ #define g_free(ptr) if (ptr) {g_free(ptr);ptr=0;}
+ 
+diff -ruN emu-tools-0.9.4aa/scripts/Makefile emu-tools-0.9.4/scripts/Makefile
+--- emu-tools-0.9.4aa/scripts/Makefile Sun Jan 20 03:00:16 2002
++++ emu-tools-0.9.4/scripts/Makefile   Tue Jan 29 18:39:47 2002
 @@ -8,5 +8,5 @@
  else
        @echo "configuration file already installed..."
@@ -24,11 +36,11 @@ diff -ruN emu10k1-utilsdupa/scripts/Makefile emu10k1-utils/scripts/Makefile
 -      install -m 755 emu-script $(script_dir)
 +      install -m 755 emu-script $(bindir)
  
-diff -ruN emu10k1-utilsdupa/scripts/emu-script emu10k1-utils/scripts/emu-script
---- emu10k1-utilsdupa/scripts/emu-script       Mon Oct  1 13:02:11 2001
-+++ emu10k1-utils/scripts/emu-script   Fri Jan  4 22:18:46 2002
-@@ -35,7 +35,7 @@
- 
+diff -ruN emu-tools-0.9.4aa/scripts/emu-script emu-tools-0.9.4/scripts/emu-script
+--- emu-tools-0.9.4aa/scripts/emu-script       Sun Jan 20 03:00:16 2002
++++ emu-tools-0.9.4/scripts/emu-script Tue Jan 29 18:39:47 2002
+@@ -50,7 +50,7 @@
+ # unset these on the fly being particularly useful.
  
  # Default location of programs: 
 -BASE_PATH=/usr/local
@@ -36,12 +48,12 @@ diff -ruN emu10k1-utilsdupa/scripts/emu-script emu10k1-utils/scripts/emu-script
  DSPPATH=$BASE_PATH/share/emu10k1
  
  DSPMGR=$BASE_PATH/bin/emu-dspmgr
-@@ -46,7 +46,7 @@
+@@ -63,7 +63,7 @@
  load(){
  
  # Source configurations
 -  . $BASE_PATH/etc/emu10k1.conf
 +  . /etc/emu10k1.conf
- #set some variables
- if [ $USE_DIGITAL_OUTPUT = yes ]; then
-     FRONT="Digital"
+ 
+ # Pick up any coomand line overrides
+ while getopts d:t:i:r:m:s:b: OPT $SAVEARGS; do