Honor ${PREFIX}.

Make sense '-t' option.

Pointed out by:	Kentaro Inagaki <inagaki@tg.rim.or.jp>

3 files changed, 60 insertions, 2 deletions

diff --git a/x11-clocks/asclock-gtk/files/patch-aa b/x11-clocks/asclock-gtk/files/patch-aa
index dc9837d1a246..386a53512920 100644
--- a/x11-clocks/asclock-gtk/files/patch-aa
+++ b/x11-clocks/asclock-gtk/files/patch-aa
@@ -7,7 +7,7 @@
 +PREFIX?= /usr/local
  
 -GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
-+GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock"\" \
++GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
             -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk`
  GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \
  		.gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o
@@ -16,7 +16,7 @@
  
 -GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \
 -	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags`
-+GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock"\" \
++GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \
 +	     -DASCLOCK_GTK `$(CONFIG_PATH)gtk12-config --cflags`
  GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o
 -GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs`
diff --git a/x11-clocks/asclock-gtk/files/patch-ab b/x11-clocks/asclock-gtk/files/patch-ab
new file mode 100644
index 000000000000..46304a114798
--- /dev/null
+++ b/x11-clocks/asclock-gtk/files/patch-ab
@@ -0,0 +1,39 @@
+--- configure.orig	Sat Mar 27 01:56:27 1999
++++ configure	Sat Jun 12 15:44:06 1999
+@@ -2,19 +2,7 @@
+ clear
+ echo Welcome to the new world of asclock!
+ echo
+-echo Specify the versions you want to build. Note that you can always
+-echo "build them explicitly by issuing 'make asclock' (gtk) or 'make asclock_applet'"
+-echo "(gnome) in the shell."
+-echo "asclock         : the gtk standalone version"
+-echo "asclock_applet  : the applet version (always docks to the gnome panel)"
+-echo "all             : both versions"
+-printf "I want to build [default=='asclock']:"
+-read build
+-case $build in
+-  asclock_applet)  build="asclock_applet";;
+-  all)             build="all";;
+-  *)     	   build="asclock";;
+-esac
++build="asclock"
+ 
+ echo You selected \'make $build\'
+ echo
+@@ -74,15 +62,6 @@
+     else echo "char *second_xpm[] = { NULL };" >>./default_theme/second.xpm
+     fi
+ 
+-    echo Do you want to build \'$build\' now [default==\'yes\']?
+-    read bla
+-    case $bla in
+-      [Nn]|[Nn][Oo])  echo no make no clock...;
+-		 exit 0;
+-		 ;;
+-	*)	 touch config.c asclock.c;
+-		 make $build;;
+-    esac
+     exit 0
+   fi
+ done
diff --git a/x11-clocks/asclock-gtk/files/patch-ac b/x11-clocks/asclock-gtk/files/patch-ac
new file mode 100644
index 000000000000..1e591468b1ce
--- /dev/null
+++ b/x11-clocks/asclock-gtk/files/patch-ac
@@ -0,0 +1,19 @@
+--- config.c~	Fri Mar 26 16:38:29 1999
++++ config.c	Sat Jun 12 15:55:56 1999
+@@ -52,14 +52,14 @@
+       fprintf(stderr, "dir : %s\n", *cpp);
+ 
+       if((dfd = opendir(*cpp)) == NULL)
+-	  printf(" not found\n\n"); 
++	  printf(" not found\n"); 
+       else {
+ 	while((dp = readdir(dfd)) != NULL)
+ 	  if ( dp->d_name[0]!='.' )
+ 	    printf("%s\n", dp->d_name);
+         closedir(dfd);
+       }
+-      printf("\n\n");
++      printf("\n");
+ 
+     }
+