[packages/bjorb.git] / bjorb-Makefile.in.patch

diff -Nura bjorb-0.5.5p1/src/Makefile.in bjorb-0.5.5p1.new/src/Makefile.in
--- bjorb-0.5.5p1/src/Makefile.in	2004-08-11 21:31:14.000000000 +0200
+++ bjorb-0.5.5p1.new/src/Makefile.in	2004-08-11 21:55:49.000000000 +0200
@@ -29,10 +29,11 @@
 LDFLAGS =
 LIBS = @LIBS@
 
+DESTDIR =
 PREFIX ?= @prefix@
 exec_prefix = $(PREFIX)
-sbindir = $(exec_prefix)/sbin
-etcdir = $(exec_prefix)/etc
+sbindir = @sbindir@
+etcdir = @sysconfdir@ 
 
 CC = @CC@
 RM = rm -rf
@@ -45,9 +46,8 @@
 
 ### SSL Configuration
 
-SSLTOP      = @ssltop@
-SSL_CFLAGS  = -I$(SSLTOP)/include
-SSL_LDFLAGS = -L$(SSLTOP)/lib
+INCLUDEDIR = @includedir@
+SSL_CFLAGS  = -I$(INCLUDEDIR)/openssl
 SSL_LIBS    = @ssllibs@
 
 ###
@@ -76,9 +76,10 @@
 
 all:: $(TARGET)
 install:: $(TARGET)
-	$(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
-	@if test ! -d $(etcdir) ; then mkdir $(etcdir); fi
-	$(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(etcdir)/bjorb.conf.sample
+	@if test ! -d $(DESTDIR)$(sbindir) ; then mkdir -p $(DESTDIR)$(sbindir); fi
+	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)
+	@if test ! -d $(DESTDIR)$(etcdir) ; then mkdir -p $(DESTDIR)$(etcdir); fi
+	$(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(DESTDIR)$(etcdir)
 
 $(TARGET): $(OBJS)
 	$(CXX) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)
Commit	Line	Data
0d471e44	1	diff -Nura bjorb-0.5.5p1/src/Makefile.in bjorb-0.5.5p1.new/src/Makefile.in
	2	--- bjorb-0.5.5p1/src/Makefile.in 2004-08-11 21:31:14.000000000 +0200
	3	+++ bjorb-0.5.5p1.new/src/Makefile.in 2004-08-11 21:55:49.000000000 +0200
	4	@@ -29,10 +29,11 @@
	5	LDFLAGS =
	6	LIBS = @LIBS@
	7
	8	+DESTDIR =
	9	PREFIX ?= @prefix@
	10	exec_prefix = $(PREFIX)
	11	-sbindir = $(exec_prefix)/sbin
	12	-etcdir = $(exec_prefix)/etc
	13	+sbindir = @sbindir@
	14	+etcdir = @sysconfdir@
	15
	16	CC = @CC@
	17	RM = rm -rf
	18	@@ -45,9 +46,8 @@
	19
	20	### SSL Configuration
	21
	22	-SSLTOP = @ssltop@
	23	-SSL_CFLAGS = -I$(SSLTOP)/include
	24	-SSL_LDFLAGS = -L$(SSLTOP)/lib
	25	+INCLUDEDIR = @includedir@
	26	+SSL_CFLAGS = -I$(INCLUDEDIR)/openssl
	27	SSL_LIBS = @ssllibs@
	28
	29	###
	30	@@ -76,9 +76,10 @@
	31
	32	all:: $(TARGET)
	33	install:: $(TARGET)
	34	- $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
	35	- @if test ! -d $(etcdir) ; then mkdir $(etcdir); fi
	36	- $(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(etcdir)/bjorb.conf.sample
	37	+ @if test ! -d $(DESTDIR)$(sbindir) ; then mkdir -p $(DESTDIR)$(sbindir); fi
	38	+ $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)
	39	+ @if test ! -d $(DESTDIR)$(etcdir) ; then mkdir -p $(DESTDIR)$(etcdir); fi
	40	+ $(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(DESTDIR)$(etcdir)
	41
	42	$(TARGET): $(OBJS)
	43	$(CXX) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)