13c13
< #define  DATADIR	"/data/lilac1/bsimon/iraf/newcdbs/data/"
---
> #define  DATADIR(x)	"/data/lilac1/bsimon/iraf/newcdbs/data/" #x
18c18
< #define  DATADIR	"/data/cdbs1/tools/data/"
---
> #define  DATADIR(x)	"/data/cdbs1/tools/data/" #x
22c22
< #define  DATADIR	"disk$user6:[bsimon.iraf.newcdbs.data]"
---
> #define  DATADIR	"disk$user6:[bsimon.iraf.newcdbs.data]" #x
27c27
< #define  VERSION_STRING "17 July 1997"	/* Update with every release!! */
---
> #define  VERSION_STRING "20 June 1997"	/* Update with every release!! */
71,74c71,73
< #define  DATAFILE(x)	DATADIR #x
< #define  CATALOG_NAME	DATAFILE(cdbscatalog.dat)
< #define  DIRECTORY_NAME	DATAFILE(directory.dat)
< #define  THRUCAT_NAME   DATAFILE(thrucat.dat)
---
> #define  CATALOG_NAME	DATADIR(cdbscatalog.dat)
> #define  DIRECTORY_NAME	DATADIR(directory.dat)
> #define  THRUCAT_NAME   DATADIR(thrucat.dat)
77d75
<