--- popt/Makefile.in.orig	Tue Dec 22 03:30:11 1998
+++ popt/Makefile.in	Tue Nov  9 01:47:51 1999
@@ -70,7 +70,7 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-SUBDIRS = po
+SUBDIRS = @PO@
 
 LDFLAGS = -L$(top_builddir)
 INCLUDES = -I$(top_srcdir)
@@ -130,20 +130,21 @@
 
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+# these rules should be in here, but they drive me batty
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	#cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	#cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
+#$(ACLOCAL_M4):  configure.in 
+	#cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
+#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	#$(SHELL) ./config.status --recheck
+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	#cd $(srcdir) && $(AUTOCONF)
 
 config.h: stamp-h
 	@:
@@ -152,10 +153,10 @@
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
 	@echo timestamp > stamp-h
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
+#$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	#cd $(top_srcdir) && $(AUTOHEADER)
+	#@echo timestamp > $(srcdir)/stamp-h.in
 
 mostlyclean-hdr:
 
