handles this.
Don't install our own odbcinst.ini. That's the driver manager's business.
#
# GNUMakefile for psqlodbc (Postgres ODBC driver)
#
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.20 2001/09/22 22:54:32 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.21 2001/09/23 13:32:24 petere Exp $
#
#-------------------------------------------------------------------------
SO_MAJOR_VERSION = 0
SO_MINOR_VERSION = 27
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
endif
ifeq ($(with_unixodbc)$(with_iodbc),nono)
OBJS += gpps.o
+override CPPFLAGS += -DODBCINSTDIR='"$(odbcinst_ini_dir)"'
endif
all: all-lib
install: all installdirs
- $(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini
$(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql
$(MAKE) install-lib
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(odbcinst_ini_dir) $(DESTDIR)$(datadir)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(datadir)
uninstall: uninstall-lib
rm -f $(DESTDIR)$(datadir)/odbc.sql
-# XXX Uninstall the .ini file as well?
clean distclean maintainer-clean: clean-lib
rm -f $(OBJS)
#define UNKNOWNS_AS_DONTKNOW 1
#define UNKNOWNS_AS_LONGEST 2
-/* INI File Stuff */
+/* ODBC initialization files */
#ifndef WIN32
#define ODBC_INI ".odbc.ini"
-#ifdef ODBCINSTDIR
-#define ODBCINST_INI ODBCINSTDIR "/odbcinst.ini"
+#define ODBCINST_INI "odbcinst.ini"
#else
-#define ODBCINST_INI "/etc/odbcinst.ini"
+#define ODBC_INI "ODBC.INI"
+#define ODBCINST_INI "ODBCINST.INI"
#endif
-#else /* WIN32 */
-#define ODBC_INI "ODBC.INI" /* ODBC initialization
- * file */
-#define ODBCINST_INI "ODBCINST.INI" /* ODBC Installation
- * file */
-#endif /* WIN32 */
#define INI_DSN DBMS_NAME /* Name of default
#define FALSE ((BOOL)0)
#endif
+#ifndef ODBCINSTDIR
+#error "ODBCINSTDIR must be defined to compile this file"
+#endif
+
/*
* theIniFileName is searched for in:
* $HOME/theIniFileName
* theIniFileName
- * ODBCINST_INI
+ * ODBCINSTDIR/ODBCINST_INI
*/
DWORD
GetPrivateProfileString(const char *theSection, /* section name */
{
aFile = (FILE *) fopen(theIniFileName, PG_BINARY_R);
if (!aFile)
- aFile = (FILE *) fopen(ODBCINST_INI, PG_BINARY_R);
+ aFile = (FILE *) fopen(ODBCINSTDIR "/" ODBCINST_INI, PG_BINARY_R);
}
aLength = (theDefault == NULL) ? 0 : strlen(theDefault);