diff --git a/Makefile b/Makefile index 36254c0..9d19489 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 2007-11-29 21:30:22 dim Exp $ +# $Id: Makefile,v 1.7 2007-12-01 10:15:29 dim Exp $ # # Makefile for debian packaging purpose, make install not intended to work. @@ -9,7 +9,7 @@ VERSION = $(shell ./pgloader.py --version | cut -d' ' -f3) # debian setting DESTDIR = -libdir = $(DESTDIR)/usr/share/pgloader +libdir = $(DESTDIR)/usr/share/python-support/pgloader exdir = $(DESTDIR)/usr/share/doc/pgloader pgloader = pgloader.py diff --git a/debian/dirs b/debian/dirs index 275a1b3..f9b6f3f 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,5 @@ usr/bin usr/sbin +usr/bin/python-support usr/share/pgloader usr/share/doc/pgloader diff --git a/examples/pgloader.conf b/examples/pgloader.conf index 8c09f74..da571df 100644 --- a/examples/pgloader.conf +++ b/examples/pgloader.conf @@ -14,8 +14,6 @@ commit_every = 5 null = "" empty_string = "\ " -reformat_path = /usr/share/pgloader/reformat - [simple_tmpl] template = True format = text diff --git a/pgloader/options.py b/pgloader/options.py index a410d3a..90edbf4 100644 --- a/pgloader/options.py +++ b/pgloader/options.py @@ -33,4 +33,4 @@ FROM_ID = None UDC_PREFIX = 'udc_' REFORMAT_PATH = None -DEFAULT_REFORMAT_PATH = ['/usr/share/pgloader/reformat'] +DEFAULT_REFORMAT_PATH = ['/usr/share/python-support/pgloader/reformat']