dmraid make.tmpl.in

dmraid make.tmpl.in

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-05-27 13:27:31

Modified files:
	.              : make.tmpl.in 

Log message:
	Define datarootdir
	Move infodir and mandir as common part in front of KLIBC 'if'

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.3&r2=1.4

--- dmraid/make.tmpl.in	2010/03/16 16:02:16	1.3
+++ dmraid/make.tmpl.in	2010/05/27 13:27:29	1.4
@@ -25,21 +25,19 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 datadir = @datarootdir@
+datarootdir = @datarootdir@
+infodir = @infodir@
+mandir = @mandir@
 ifeq ("@KLIBC@", "no")
   libdir = @libdir@
   sbindir = @sbindir@
   includedir = @includedir@
-  infodir = @infodir@
-  mandir = @mandir@
 else
   libdir = @KLIBC_LIB_DIR@
   sbindir = @KLIBC_SBIN_DIR@
   includedir = @KLIBC_INCLUDE_DIR@
-  infodir = @infodir@
-  mandir = @mandir@
 endif
 
-
 # setup misc variables
 # define the ownership variables for the binaries and man pages
 OWNER = @OWNER@

dmraid make.tmpl.in

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-05-27 13:29:46

Modified files:
	.              : make.tmpl.in 

Log message:
	remove  DESTDIR path from INCLUDES
	(compilation should be the same for  make DESTDIR=path as without it)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.4&r2=1.5

--- dmraid/make.tmpl.in	2010/05/27 13:27:29	1.4
+++ dmraid/make.tmpl.in	2010/05/27 13:29:45	1.5
@@ -87,10 +87,6 @@
 
 STRIP=
 
-ifdef DESTDIR
-  INCLUDES+=-I$(DESTDIR)/usr/include
-endif
-
 DEPS=$(top_srcdir)/make.tmpl $(top_srcdir)/tools/VERSION Makefile
 
 OBJECTS=$(SOURCES:%.c=%.o)

dmraid make.tmpl.in

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-05-28 12:31:40

Modified files:
	.              : make.tmpl.in 

Log message:
	Define  AWK and SED vars
	Used  $(SED) for DMRAID_LIB_VERSION

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.8&r2=1.9

--- dmraid/make.tmpl.in	2010/05/28 09:17:24	1.8
+++ dmraid/make.tmpl.in	2010/05/28 12:31:39	1.9
@@ -15,6 +15,9 @@
 MKDIR_P = @MKDIR_P@
 LN_S = @LN_S@
 LIBS = @LIBS@
+AWK = @AWK@
+SED = @SED@
+
 CFLAGS += @CFLAGS@
 CLDFLAGS += @CLDFLAGS@
 LDFLAGS += @LDFLAGS@
@@ -29,6 +32,7 @@
 datarootdir = @datarootdir@
 infodir = @infodir@
 mandir = @mandir@
+usrlibdir = @usrlibdir@
 ifeq ("@KLIBC@", "no")
   libdir = @libdir@
   sbindir = @sbindir@
@@ -41,7 +45,7 @@
 
 # setup misc variables
 DMRAID_VERSION := $(shell cat $(top_srcdir)/tools/VERSION)
-DMRAID_LIB_VERSION := $(shell sed --quiet 's/^.*\(DMRAID_LIB_VERSION\)[^_].*"\(.*\)"/\2/p' $(top_srcdir)/lib/version.h)
+DMRAID_LIB_VERSION := $(shell $(SED) --quiet 's/^.*\(DMRAID_LIB_VERSION\)[^_].*"\(.*\)"/\2/p' $(top_srcdir)/lib/version.h)
 INSTALL_PROGRAM = $(INSTALL) $(STRIP)
 INSTALL_DIR = $(INSTALL) -d
 INSTALL_DATA = $(INSTALL) -m 644 -p

dmraid make.tmpl.in

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-05-30 22:13:56

Modified files:
	.              : make.tmpl.in 

Log message:
	Add support for DEVMAPPEREVENT_CFLAGS
	Use vpath for .c files

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.12&r2=1.13

--- dmraid/make.tmpl.in	2010/05/30 19:15:26	1.12
+++ dmraid/make.tmpl.in	2010/05/30 22:13:56	1.13
@@ -17,6 +17,7 @@
 LIBS = @LIBS@
 AWK = @AWK@
 SED = @SED@
+DEVMAPPEREVENT_CFLAGS = @DEVMAPPEREVENT_CFLAGS@
 DEVMAPPEREVENT_LIBS = @DEVMAPPEREVENT_LIBS@
 DMRAID_LIB_DATE = @DMRAID_LIB_DATE@
 DMRAID_LIB_MAJOR = @DMRAID_LIB_MAJOR@
@@ -49,6 +50,8 @@
   includedir = @KLIBC_INCLUDE_DIR@
 endif
 
+vpath %.c $(srcdir)
+
 # setup misc variables
 INSTALL_PROGRAM = $(INSTALL) $(STRIP)
 INSTALL_DIR = $(INSTALL) -d