Browse Source

Fixes to makefile to compile on F19. Fixed mime type as returned by plaintext test.

David Moreno 12 years ago
parent
commit
68a7db06e4
2 changed files with 3 additions and 3 deletions
  1. 2 2
      onion/Makefile
  2. 1 1
      onion/hello.c

+ 2 - 2
onion/Makefile

@@ -6,10 +6,10 @@ LDFLAGS=-lonion -ljson -lmysqlclient -lpthread -L/usr/lib64/mysql/ -L.
 hello.o: onion hello.c 
 
 hello: hello.o libonion_static.a base_html.o fortunes_html.o
-	cc hello.o base_html.o fortunes_html.o libonion_static.a -o hello -lpthread -lmysqlclient -ljson -lgnutls -lrt
+	cc hello.o base_html.o fortunes_html.o libonion_static.a -o hello -lpthread `mysql_config --libs` `pkg-config json --libs` -lgnutls -lgcrypt -lrt
 
 clean:
-	rm -f *.o hello base_html.c fortunes_html.c
+	rm -r *.o hello base_html.c fortunes_html.c
 
 	
 libonion_static.a: onion

+ 1 - 1
onion/hello.c

@@ -223,7 +223,7 @@ void free_connection(struct test_data *data, MYSQL *db){
 }
 
 onion_connection_status return_plaintext(onion_request *req, onion_response *res){
-	onion_response_set_header(res, "Content-Type","plain/text");
+	onion_response_set_header(res, "Content-Type","text/plain");
 	onion_response_write0(res, "Hello, World!");
 	return OCS_PROCESSED;
 }