[Merge Req] Summary for xlib-ffi--steve--1.0--patch-1

[Steve Youngs <steve@xxxxxxxx>]

Location: steve@xxxxxxxxxxxxxx http://arch.eicq.org/2007/

Revision: xlib-ffi--steve--1.0--patch-1
Archive: steve@xxxxxxxxxxxxxx
Creator: Steve Youngs <steve@xxxxxxxx>
Date: Thu Dec 14 13:11:42 EST 2006
Standard-date: 2006-12-14 03:11:42 GMT
Modified-files: Makefile package-info.in
New-patches: steve@xxxxxxxxxxxxxx/xlib-ffi--steve--1.0--patch-1
Summary: Build fix -- handle SXEmacs FHS install hierarchy.
Keywords: build/compile, internal

* Makefile (PREFIX): Determine default based on value of $XEMACS because
  SXEmacs now uses a FHS-compliant install hierarchy.

* package-info.in (procides): Add missing ones.


* added files

    
{arch}/xlib-ffi/xlib-ffi--steve/xlib-ffi--steve--1.0/steve@xxxxxxxxxxxxxx/patch-log/patch-1

* modified files

--- orig/Makefile
+++ mod/Makefile
@@ -38,10 +38,24 @@
 
 SHELL = /bin/sh
 
-# Everything hangs off this.  
+# Programs and their flags.
+ifndef XEMACS
+XEMACS = sxemacs
+endif
+XEMACS_FLAGS = -batch -no-autoloads
+INSTALL = install
 
+PKG_INSTALL = install
+TAR = tar
+TAR_FLAGS = czf
+
+# Our prefix. Everything hangs off this.  
 ifndef PREFIX
-PREFIX = /usr/local/lib/sxemacs/site-packages
+  ifeq ('$(XEMACS)','sxemacs')
+    PREFIX = /usr/local/share/sxemacs/site-packages
+  else
+    PREFIX = /usr/local/lib/xemacs/site-packages
+  endif
 endif
 
 # Where the lisp files go.
@@ -53,17 +67,6 @@
 STAGING = ../build-pkg
 LISP_STAGING = $(STAGING)/lisp/$(PACKAGE)
 
-# Programs and their flags.
-ifndef XEMACS
-XEMACS = sxemacs
-endif
-XEMACS_FLAGS = -batch -no-autoloads
-INSTALL = install
-
-PKG_INSTALL = install
-TAR = tar
-TAR_FLAGS = czf
-
 ############################################################################
 ##                No User Configurable Items Below Here                   ##
 ############################################################################


--- orig/package-info.in
+++ mod/package-info.in
@@ -13,7 +13,9 @@
    filename FILENAME
    md5sum MD5SUM
    size SIZE
-   provides (ffi-xlib xlib-const xlib-common xlib-xlib xlib-version)
+   provides (ffi-xlib xlib-common xlib-const xlib-hello xlib-keysymdb
+                xlib-tray xlib-vidmode xlib-xinerama xlib-xlib xlib-xpm
+                xlib-xrecord xlib-xshape xlib-xtest)
    requires (REQUIRES)
    type regular
 ))