Ticket #3457: osm2pgsqldir.diff

File osm2pgsqldir.diff, 1.6 KB (added by M-Reimer, 8 years ago)

Better patch for this issue.

  • osm2pgsql-0.70.5+r25090

    Fix for default path of "default.style".
    Written 2011-06-26 Manuel Reimer <manuel.reimer@gmx.de>
    
    diff -U 8 -r osm2pgsql-0.70.5+r25090.old//Makefile.am osm2pgsql-0.70.5+r25090/Makefile.am
    old new  
    3030        else :; fi
    3131
    3232BUILT_SOURCES = \
    3333  fileformat.pb-c.c fileformat.pb-c.h \
    3434  osmformat.pb-c.c osmformat.pb-c.h
    3535
    3636endif
    3737
    38 AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"' -DVERSION='"@PACKAGE_VERSION@"'
    39 AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"'
     38osm2pgsqldir = $(datadir)/osm2pgsql
     39
     40AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"'
     41AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"'
    4042
    4143AM_LDFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROTOBUF_C_LDFLAGS@
    4244
    43 osm2pgsqldir = $(datadir)/osm2pgsql
    4445osm2pgsql_DATA = default.style 900913.sql
    4546
    4647EXTRA_DIST = osm2pgsql.spec.in \
    4748             osm2pgsql.spec \
    4849             protobuf/fileformat.proto \
    4950             protobuf/osmformat.proto \
    5051             $(osm2pgsql_DATA)
    5152