head	1.4;
access;
symbols
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.3
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.2
	RELEASE_5_2_0:1.2
	RELEASE_4_9_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2010.06.07.05.06.29;	author pgollucci;	state dead;
branches;
next	1.3;

1.3
date	2008.08.31.20.00.40;	author clement;	state Exp;
branches;
next	1.2;

1.2
date	2003.09.26.17.25.14;	author naddy;	state Exp;
branches;
next	1.1;

1.1
date	2003.07.23.21.32.23;	author oliver;	state Exp;
branches;
next	;


desc
@@


1.4
log
@- Remove unused patch file
@
text
@--- Makefile.orig	2007-02-21 22:29:07.000000000 +0100
+++ Makefile	2008-08-31 21:53:05.000000000 +0200
@@@@ -1,10 +1,10 @@@@
 ##
 ##  Makefile -- Build procedure for mod_layout Apache module
 ##
-builddir=$(shell pwd)
+#builddir=$(shell pwd)
 
 #   the used tools
-APXS=apxs
+APXS=${LOCALBASE}/sbin/apxs
 APACHECTL=apachectl
 CC=`$(APXS) -q CC`
 INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
@


1.3
log
@- Update to 4.1
@
text
@@


1.2
log
@* Update to 4.0.2a
* Use LATEST_LINK

PR:		57178
Submitted by:	Clement Laforet <sheepkiller@@cultdeadsheep.org>
@
text
@d1 3
a3 3
--- Makefile.orig	Wed Sep 24 17:56:08 2003
+++ Makefile	Wed Sep 24 17:56:33 2003
@@@@ -1,13 +1,13 @@@@
a7 3
-top_srcdir=/usr/local/apache2
-top_builddir=/usr/local/apache2
-include /usr/local/apache2/build/special.mk
a8 3
+top_srcdir=${LOCALBASE}/share/apache2
+top_builddir=${LOCALBASE}/share/apache2
+include ${LOCALBASE}/share/apache2/build/special.mk
a15 14
@@@@ -61,12 +61,7 @@@@
 	$(APXS) -c header.c
 #   install the shared object file into Apache 
 install: 
-	$(APXS) -iac $(INCLUDES) $(LIBS) $(SRC)
-	@@echo "+--------------------------------------------------------+"; \
-	echo "| All done.                                              |"; \
-	echo "|                                                        |"; \
-	echo "| Thanks for installing mod_layout.                      |"; \
-	echo "+--------------------------------------------------------+"; \
+	$(APXS) -ia $(INCLUDES) $(LIBS) mod_layout.la
 
 rpm: dist
 	cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES
@


1.1
log
@Add mod_layout2 4.0.1a,
apache2 module to wrap served pages with a
header and/or footer.

PR:		45496
Submitted by:	Clement Laforet <sheepkiller@@cultdeadsheep.org>
@
text
@d1 3
a3 3
--- Makefile.orig	Mon Oct 21 19:38:28 2002
+++ Makefile	Sat Nov 16 16:10:44 2002
@@@@ -1,17 +1,17 @@@@
d11 1
a11 1
+#builddir=${WRKSRC}
d17 1
a17 1
-APXS=/usr/local/apache2/bin/apxs
d22 1
a22 24
-LD_SHLIB=`apxs -q LDFLAGS_SHLIB`
+LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -lapr -L${LOCALBASE}/apache2
 VERSION = 4.0.1a
 DISTNAME = mod_layout
 DISTVNAME = $(DISTNAME)-$(VERSION)
@@@@ -36,7 +36,7 @@@@
 # Apache itself won't compile with it this strict
 #DEF = -Wall -DDEBUG -Wtraditional -Wshadow -Wid-clash-len -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings-Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wlong-long -Winline -Werror
 #DEF = -Wall -DDEBUG 
-
+DEF= -L${LOCALBASE}/lib/apache2 -lapr
 #   the default target
 all: mod_layout.so
 
@@@@ -44,8 +44,6 @@@@
 #mod_layout.so: $(OBJ)  Makefile
 mod_layout.so: $(OBJ)
 	$(APXS) -o liblayout.la -c $(SOBJ)
-	#$(APXS) -c -o liblayout $(SOBJ)
-	#$(APXS) -i -a mod_layout.la
 
 mod_layout.o : mod_layout.c
 	$(APXS) -c mod_layout.c 
@@@@ -63,17 +61,7 @@@@
d26 1
a26 1
-	$(APXS) -i -n liblayout.so -e liblayout.la
a29 5
-	echo "| You will need to add the directive:                    |"; \
-	echo "| LoadModule layout_module modules/liblayout.so          |"; \
-	echo "|                                                        |"; \
-	echo "| So that you can begin to use mod_layout.               |"; \
-	echo "|                                                        |"; \
d32 1
a32 1
+	$(APXS) -a -i -n liblayout.so -e liblayout.la
d34 1
a34 1
 rpm: #all dist
@

