X-Git-Url: http://git.maemo.org/git/?p=erwise;a=blobdiff_plain;f=erwise%2FMakefile;h=c9fd768ae414fc8ff086b6060ebdead3fb87dd33;hp=8c7702a2bd5c95e8b12b8c719e165e3a6807b684;hb=HEAD;hpb=fdfb756bfb7021c4288c07d7dd7d7471cee11d6e;ds=sidebyside

diff --git a/erwise/Makefile b/erwise/Makefile
index 8c7702a..c9fd768 100644
--- a/erwise/Makefile
+++ b/erwise/Makefile
@@ -96,7 +96,7 @@
      INSTDATFLAGS = -m 0444
     INSTKMEMFLAGS = -g kmem -m 2755
 
-      PROJECTROOT = /v/X11R5
+      PROJECTROOT = /usr/X11R6
 
      TOP_INCLUDES = -I$(INCROOT)
 
@@ -110,7 +110,7 @@
 
            LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
 
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR)
+        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR) 
 
    LDCOMBINEFLAGS = -X -r
       DEPENDFLAGS =
@@ -135,9 +135,9 @@
 # X Window System make variables; this need to be coordinated with rules
 
           PATHSEP = /
-        USRLIBDIR = /v/X11R5/lib
-           BINDIR = /v/X11R5/bin
-          INCROOT = /v/X11R5/include
+        USRLIBDIR = /usr/X11R6/lib
+           BINDIR = /usr/X11R6/bin
+          INCROOT = /usr/X11R6/include
      BUILDINCROOT = $(TOP)
       BUILDINCDIR = $(BUILDINCROOT)/X11
       BUILDINCTOP = ..
@@ -151,7 +151,7 @@
          XINITDIR = $(LIBDIR)/xinit
            XDMDIR = $(LIBDIR)/xdm
            TWMDIR = $(LIBDIR)/twm
-          MANPATH = /v/X11R5/man
+          MANPATH = /usr/X11R6/man
     MANSOURCEPATH = $(MANPATH)/man
         MANSUFFIX = n
      LIBMANSUFFIX = 3
@@ -217,17 +217,17 @@ PICFLAGS = -fPIC
           DEPXLIB = $(DEPEXTENSIONLIB)
              XLIB = $(EXTENSIONLIB) -lX11
 
-        DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV)
+        DEPXMULIB = 
        XMULIBONLY = -lXmu
            XMULIB = -lXmu
 
        DEPOLDXLIB =
           OLDXLIB = -loldX
 
-      DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV)
+      DEPXTOOLLIB = 
          XTOOLLIB = -lXt
 
-        DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV)
+        DEPXAWLIB = 
            XAWLIB = -lXaw
 
         DEPXILIB =