dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/support Makefile.am, 1.44, 1.45 path.c,


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/support Makefile.am, 1.44, 1.45 path.c, 1.3, 1.4
Date: Mon, 21 Jul 2003 23:41:22 -0400

Update of /cvsroot/dotgnu-pnet/pnet/support
In directory subversions:/tmp/cvs-serv23959/support

Modified Files:
        Makefile.am path.c 
Log Message:


Move the cscc include directories from ${prefix}/lib to ${prefix}/share,
to be consistent with Debian guidelines.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** Makefile.am 16 Dec 2002 01:17:27 -0000      1.44
--- Makefile.am 22 Jul 2003 03:41:20 -0000      1.45
***************
*** 67,71 ****
  AM_CFLAGS = -I$(top_srcdir)/libgc/include -I$(top_srcdir)/include \
                        -DCSCC_LIB_PREFIX=\"$(libdir)\" \
!                   -DCSCC_BIN_PREFIX=\"$(bindir)\"
  
  CLEANFILES = $(srcdir)/errno_map.c
--- 67,72 ----
  AM_CFLAGS = -I$(top_srcdir)/libgc/include -I$(top_srcdir)/include \
                        -DCSCC_LIB_PREFIX=\"$(libdir)\" \
!                   -DCSCC_BIN_PREFIX=\"$(bindir)\" \
!                   -DCSCC_DATA_PREFIX=\"$(datadir)\"
  
  CLEANFILES = $(srcdir)/errno_map.c

Index: path.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/path.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** path.c      15 May 2003 02:46:28 -0000      1.3
--- path.c      22 Jul 2003 03:41:20 -0000      1.4
***************
*** 203,206 ****
--- 203,218 ----
  }
  
+ char *ILGetStandardDataPath(const char *tail)
+ {
+       if(tail)
+       {
+               return GetFileInBasePath("/share/", tail);
+       }
+       else
+       {
+               return GetFileInBasePath("/share", 0);
+       }
+ }
+ 
  char *ILGetStandardProgramPath(void)
  {
***************
*** 229,232 ****
--- 241,264 ----
        {
                return ILDupString(CSCC_LIB_PREFIX);
+       }
+ }
+ 
+ char *ILGetStandardDataPath(const char *tail)
+ {
+       if(tail)
+       {
+               char *path = (char *)ILMalloc(strlen(CSCC_DATA_PREFIX) +
+                                                                         
strlen(tail) + 2);
+               if(path)
+               {
+                       strcpy(path, CSCC_DATA_PREFIX);
+                       strcat(path, "/");
+                       strcat(path, tail);
+               }
+               return path;
+       }
+       else
+       {
+               return ILDupString(CSCC_DATA_PREFIX);
        }
  }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]