--- np2/x11/Makefile.am	2011/12/16 11:55:26	1.3
+++ np2/x11/Makefile.am	2011/12/22 15:17:47	1.7
@@ -1,4 +1,4 @@
-#	$Id: Makefile.am,v 1.3 2011/12/16 11:55:26 monaka Exp $
+#	$Id: Makefile.am,v 1.7 2011/12/22 15:17:47 monaka Exp $
 
 real_topsrcdir=	$(top_srcdir)/..
 
@@ -241,7 +241,7 @@ AM_CPPFLAGS=	-I$(real_topsrcdir) \
 		-I$(real_topsrcdir)/vram \
 		$(GTK_CFLAGS) $(SDL_CFLAGS)
 
-AM_CFLAGS=	-fsigned-char -fno-strict-aliasing
+AM_CFLAGS=	-fsigned-char
 
 xnp2_LDADD=	$(GTK_LIBS) $(SDL_LIBS) \
 		$(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
@@ -287,13 +287,6 @@ AM_CPPFLAGS+=	-I$(real_topsrcdir)/i386c 
 		-I$(real_topsrcdir)/i386c/ia32/instructions/fpu
 
 DEFS+=		-DCPUCORE_IA32
-##DEFS+=	-DUSE_FPU
-##DEFS+=	-DSUPPORT_MEMDBG32
-##DEFS+=	-DIA32_PROFILE_TLB
-##DEFS+=	-DIA32_INSTRUCTION_TRACE
-##DEFS+=	-DIA32_CROSS_CHECK
-##DEFS+=	-DIA32_REBOOT_ON_PANIC
-##DEFS+=	-DMORE_DEBUG
 else
 xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i286c.c \
 		$(real_topsrcdir)/i286c/i286c_mn.c \
@@ -311,6 +304,7 @@ xnp2_SOURCES+=	$(real_topsrcdir)/i286c/i
 AM_CPPFLAGS+=	-I$(real_topsrcdir)/i286c
 endif
 
-.man.1 .jman.1j:
-	sed -e 's;/usr/X11R6/lib/X11/xnp2;${DESTDIR}${pkgdatadir};' \
-	    < $< > $@
+cleandir:: distclean
+
+.man1.1 .jman1.1j:
+	@sed -e 's;@PKGDATADIR@;${DESTDIR}${pkgdatadir};' < $> > $@