Package: fnord
Version: 1.10-2
Severity: wishlist
Tags: patch, upstream

Hi,

It would be useful if fnord would not just ship fnord-idx and fnord-cgi,
but also fnord-cgi-idx.  That'd be the only way to have fnord supporting
both CGI and autogenerated directory-listings in one vhost.

Attached Makefile enables this.  Applying this:

--------

+++ fnord-1.10/debian/rules
@@ -39,6 +39,7 @@
        install -m0755 fnord '$(DIR)'/usr/sbin/fnord
        install -m0755 fnord-cgi '$(DIR)'/usr/sbin/fnord-cgi
        install -m0755 fnord-idx '$(DIR)'/usr/sbin/fnord-idx
+       install -m0755 fnord-cgi-idx '$(DIR)'/usr/sbin/fnord-cgi-idx
        install -m0755 fnord-conf '$(DIR)'/usr/sbin/fnord-conf
        # contributed
        install -m0755 debian/fnord-ssl-conf '$(DIR)'/usr/sbin/fnord-ssl-conf

--------

makes sure it is shipped and installed with the Debian package.

Thanks for maintaining fnord for Debian.

Bye,

Joost

CC=gcc
CXX=g++

#LIBOWFAT=../libowfat/
DIET=diet -Os

CFLAGS=-Os -fomit-frame-pointer
#CFLAGS=-g

all: fnord fnord-cgi fnord-idx fnord-cgi-idx

fnord: httpd
        cp -p $^ $@
        -strip -R .note -R .comment $@

httpd: httpd.o libowfat.a
        $(DIET) $(CC) -o $@ $^ $(CFLAGS)

fnord-cgi: httpd-cgi.o libowfat.a
        $(DIET) $(CC) -o $@ $^ $(CFLAGS)
        -strip -R .note -R .comment $@

fnord-idx: httpd-idx.o libowfat.a
        $(DIET) $(CC) -o $@ $^ $(CFLAGS)
        -strip -R .note -R .comment $@

fnord-cgi-idx: httpd-cgi-idx.o libowfat.a
        $(DIET) $(CC) -o $@ $^ $(CFLAGS)
        -strip -R .note -R .comment $@

libowfat.a: httpd.o buffer_1.o buffer_puts.o buffer_flush.o buffer_put.o \
buffer_putulong.o buffer_2.o buffer_putspace.o buffer_stubborn.o \
buffer_putflush.o str_copy.o fmt_ulong.o byte_diff.o byte_copy.o \
str_len.o str_diff.o str_chr.o str_diffn.o str_start.o scan_ulong.o
        ar cru $@ $^
        -ranlib $@

httpd.o: httpd.c
        $(DIET) $(CC) -pipe $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -n 1 
CHANGES|sed 's/://')\"

httpd-cgi.o: httpd.c
        $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI 
-DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"

httpd-idx.o: httpd.c
        $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST 
-DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"

httpd-cgi-idx.o: httpd.c
        $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI -DDIR_LIST 
-DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"

%.o: %.c
        $(DIET) $(CC) -pipe $(CFLAGS) -c $^

%.o: %.cpp
        $(DIET) $(CXX) -pipe $(CFLAGS) -c $^

.PHONY: rename clean install server
server: fnord
        tcpserver -v -RHl localhost 0 8000 ./fnord

clean:
        rm -f *.[oa] httpd fnord fnord-cgi fnord-idx fnord-cgi-idx

install:
        test -d /command || mkdir /command

CURNAME=$(notdir $(shell pwd))
VERSION=fnord-$(shell head -n 1 CHANGES|sed 's/://')

tar: rename
        cd .. && tar cvvf $(VERSION).tar.bz2 --use=bzip2 --exclude CVS 
--exclude bin-* --exclude .cvsignore --exclude default $(VERSION)

rename:
        if test $(CURNAME) != $(VERSION); then cd .. && mv $(CURNAME) 
$(VERSION); fi

Attachment: signature.asc
Description: Digital signature

Reply via email to