Generalise the build a bit more.

1) Fix up the NOSHARED stuff (bde)
2) Accomodate CFLAGS (vanilla)
3) Provide separate files for i386 and alpha (Doug Rabson)

In case 3, the supplied files were corrupted, but the concepts
sound enough, so I just copied what exists into
config.SH-{elf|aout}.{i386|alpha}. Alpha team, go ahead and do what
is necessary on config.SH-elf.alpha. :-)

8 files changed, 600 insertions, 14 deletions

diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 3c43000..100d3dd 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/09/12 15:45:29 markm Exp $
+# $Id: Makefile,v 1.3 1998/09/12 19:16:32 markm Exp $
 #
 
 LIB=	perl
@@ -28,7 +28,7 @@ CLEANFILES+=	config.h config.sh config_h.sh
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: config.SH-${OBJFORMAT}
+config.sh: config.SH-${OBJFORMAT}.${MACHINE_ARCH}
 	ln -sf ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
index 954c1c8..f6a89cd 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-aout
+++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
@@ -459,7 +459,7 @@ nonxs_ext='Errno'
 nroff='nroff'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
-optimize='-O'
+optimize=${CFLAGS:-''}
 orderlib='false'
 osname='freebsd'
 osvers='3.0-current'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index 35f21f7..bf885d0 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -459,7 +459,7 @@ nonxs_ext='Errno'
 nroff='nroff'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
-optimize='-O'
+optimize=${CFLAGS:-''}
 orderlib='false'
 osname='freebsd'
 osvers='3.0-current'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
new file mode 100644
index 0000000..bf885d0
--- /dev/null
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -0,0 +1,587 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Wed Sep  2 12:54:30 SAST 1998
+# Configured by     : root
+# Target system     : freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+alignbytes='4'
+ansi2knr=''
+aphostname=''
+apiversion='5.005'
+ar='ar'
+archlib='/usr/libdata/perl/5.00502/mach'
+archlibexp='/usr/libdata/perl/5.00502/mach'
+archname='i386-freebsd'
+archobjs=''
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+binexp='/usr/bin'
+bison=''
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='cc'
+cccdlflags='-DPIC -fpic'
+ccdlflags=' '
+ccflags=''
+cf_by='root'
+cf_email='root@greenpeace.grondar.za'
+cf_time='Wed Sep  2 12:54:30 SAST 1998'
+chgrp=''
+chmod=''
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppflags=''
+cpplast='-'
+cppminus='-'
+cpprun='cc -E'
+cppstdin='cc -E'
+cryptlib=''
+csh='csh'
+d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_access='define'
+d_alarm='define'
+d_archlib='define'
+d_attribut='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='define'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='define'
+d_bzero='define'
+d_casti32='undef'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_closedir='define'
+d_const='define'
+d_crypt='define'
+d_csh='define'
+d_cuserid='undef'
+d_dbl_dig='define'
+d_difftime='define'
+d_dirnamlen='define'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_dup2='define'
+d_endgrent='define'
+d_endhent='define'
+d_endnent='define'
+d_endpent='define'
+d_endpwent='define'
+d_endsent='define'
+d_eofnblk='define'
+d_eunice='undef'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='define'
+d_fgetpos='define'
+d_flexfnam='define'
+d_flock='define'
+d_fork='define'
+d_fpathconf='define'
+d_fsetpos='define'
+d_ftime='undef'
+d_getgrent='define'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='undef'
+d_gethostprotos='define'
+d_getlogin='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetprotos='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotoprotos='define'
+d_getpwent='define'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservprotos='define'
+d_gettimeod='define'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_htonl='define'
+d_index='undef'
+d_inetaton='define'
+d_isascii='define'
+d_killpg='define'
+d_lchown='define'
+d_link='define'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lstat='define'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkfifo='define'
+d_mktime='define'
+d_msg='define'
+d_msgctl='define'
+d_msgget='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_mymalloc='undef'
+d_nice='define'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_pthread_yield='undef'
+d_pthreads_created_joinable='undef'
+d_pwage='undef'
+d_pwchange='define'
+d_pwclass='define'
+d_pwcomment='undef'
+d_pwexpire='define'
+d_pwgecos='define'
+d_pwquota='undef'
+d_pwpasswd='define'
+d_readdir='define'
+d_readlink='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='define'
+d_safemcpy='define'
+d_sanemcmp='define'
+d_sched_yield='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrps='define'
+d_sethent='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setnent='define'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setpwent='define'
+d_setregid='define'
+d_setresgid='undef'
+d_setresuid='undef'
+d_setreuid='define'
+d_setrgid='define'
+d_setruid='define'
+d_setsent='define'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_sigsetjmp='define'
+d_socket='define'
+d_sockpair='define'
+d_statblks='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strtod='define'
+d_strtol='define'
+d_strtoul='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_time='define'
+d_times='define'
+d_truncate='define'
+d_tzname='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='define'
+d_vfork='define'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+dynamic_ext='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re Errno'
+find='find'
+firstmakefile='makefile'
+flex=''
+fpostype='fpos_t'
+freetype='void'
+full_csh='/bin/csh'
+full_sed='/usr/bin/sed'
+gccversion='2.7.2.1'
+gidtype='gid_t'
+glibpth="/usr/lib /usr/local/lib"
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+huge=''
+i_arpainet='define'
+i_bsdioctl=''
+i_db='define'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_gdbm='undef'
+i_grp='define'
+i_limits='define'
+i_locale='define'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_ndbm='define'
+i_netdb='define'
+i_neterrno='undef'
+i_niin='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='define'
+i_sysin='undef'
+i_sysioctl='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_sysselct='define'
+i_syssockio=''
+i_sysstat='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysun='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='undef'
+i_unistd='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+incpath=''
+inews=''
+installarchlib='/usr/libdata/perl/5.00502/mach'
+installbin='/usr/bin'
+installman1dir='/usr/share/man/man1'
+installman3dir='/usr/share/perl/man/man3'
+installprivlib='/usr/libdata/perl/5.00502'
+installscript='/usr/bin'
+installsitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
+installsitelib='/usr/local/lib/perl/5.00502'
+intsize='4'
+known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
+ksh=''
+large=''
+ld='ld'
+lddlflags="-shared "
+ldflags="-Wl,-E "
+less='less'
+lib_ext='.a'
+libc='undef'
+libperl='libperl.a'
+libpth="/usr/lib /usr/local/lib"
+libs='-lm -lc -lcrypt'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x'
+line='line'
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+locincpth=''
+loclibpth=''
+longdblsize='12'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseektype='off_t'
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir='/usr/share/man/man1'
+man1direxp='/usr/share/man/man1'
+man1ext='1'
+man3dir='/usr/share/perl/man/man3'
+man3direxp='/usr/share/perl/man/man3'
+man3ext='3'
+medium=''
+mips=''
+mips_type=''
+mkdir='mkdir'
+models='none'
+modetype='mode_t'
+more='more'
+mv=''
+myarchname='i386-freebsd'
+mydomain='.grondar.za'
+myhostname='greenpeace'
+myuname='freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 '
+n='-n'
+netdb_hlen_type='int'
+netdb_host_type='const char *'
+netdb_name_type='const char *'
+netdb_net_type='unsigned long'
+nm='nm'
+nm_opt=''
+nm_so_opt=''
+nonxs_ext='Errno'
+nroff='nroff'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+optimize=${CFLAGS:-''}
+orderlib='false'
+osname='freebsd'
+osvers='3.0-current'
+package='perl5'
+pager='/usr/bin/more'
+passcat='cat /etc/passwd'
+patchlevel='5'
+path_sep=':'
+perl='perl'
+perladmin='root@greenpeace.grondar.za'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/libdata/perl/5.00502'
+privlibexp='/usr/libdata/perl/5.00502'
+prototype='define'
+ptrsize='4'
+randbits='31'
+ranlib='/usr/bin/ranlib'
+rd_nodata='-1'
+rm='rm'
+rmail=''
+runnm='true'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+selecttype='fd_set *'
+sendmail='sendmail'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='char *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM URG STOP TSTP CONT CHLD TTIN TTOU IO XCPU XFSZ VTALRM PROF WINCH INFO USR1 USR2 IOT '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "URG", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "IO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "IOT", 0'
+sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 0'
+signal_t='void'
+sitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
+sitearchexp='/usr/local/lib/perl/5.00502/i386-freebsd'
+sitelib='/usr/local/lib/perl/5.00502'
+sitelibexp='/usr/local/lib/perl/5.00502'
+sizetype='size_t'
+sleep=''
+smail=''
+small=''
+so='so'
+sockethdr=''
+socketlib=''
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+split=''
+src='.'
+ssizetype='ssize_t'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+strings='/usr/include/string.h'
+submit=''
+subversion='2'
+sysman='/usr/share/man/man1'
+tail=''
+tar=''
+tbl=''
+tee='tee'
+test='test'
+timeincl='/usr/include/sys/time.h '
+timetype='time_t'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+usedl='define'
+usemymalloc='n'
+usenm='true'
+useopcode='true'
+useperlio='undef'
+useposix='true'
+usesfio='false'
+useshrplib='false'
+usethreads='undef'
+usevfork='true'
+usrinc='/usr/include'
+uuname=''
+version='5.00502'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+zcat=''
+zip='zip'
+# Configure command line arguments.
+config_arg0='Configure'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
+config_argc=11
+config_arg1='-Dprefix=/usr'
+config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach'
+config_arg3='-Dprivlib=/usr/libdata/perl/5.00502'
+config_arg4='-Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd'
+config_arg5='-Dsitelib=/usr/local/lib/perl/5.00502'
+config_arg6='-Dman1dir=/usr/share/man/man1'
+config_arg7='-Dman3dir=/usr/share/perl/man/man3'
+config_arg8='-des'
+config_arg9='-Ulocincpth='
+config_arg10='-Uloclibpth='
+config_arg11='-Dpager=/usr/bin/more'
+PATCHLEVEL=5
+SUBVERSION=2
+CONFIG=true
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 3b9854d..1bbfb73 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,12 +1,11 @@
 #
-# $Id$
+# $Id: Makefile,v 1.3 1998/09/12 19:16:33 markm Exp $
 #
 
 PROG=	miniperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
-NOSHARED=true
 DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	-lperl -lm -lcrypt
 
@@ -23,7 +22,7 @@ miniperlmain.o: config.h
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH}
 	@ln -sf ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index b7d9dd9..88f54bf 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id$
+# $Id: Makefile,v 1.11 1998/09/14 18:34:19 markm Exp $
 #
 
 PROG=	perl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	perlmain.c config.h
-# NOSHARED= no
+NOSHARED= no
 DPADD=	lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt
 LINKS=	${BINDIR}/${PROG} ${BINDIR}/perl5 \
@@ -38,7 +38,7 @@ ${PROG}: lib/auto/DynaLoader/DynaLoader.a
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH}
 	cp ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 20ff24e..e5d5959 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/gnu/usr.bin/perl/suidperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.2 1998/09/12 15:45:30 markm Exp $
 #
 
 PROG=	suidperl
@@ -31,7 +31,7 @@ ${PROG}: lib/auto/DynaLoader/DynaLoader.a
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH}
 	cp -p ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index ec38334..3309ca3 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.4 1998/09/12 19:16:33 markm Exp $
 #
 
 PROG=	a2p
@@ -25,7 +25,7 @@ CLEANFILES+= config.h config_h.sh config.sh ${PROG}.1
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../../libperl/config.SH-${OBJFORMAT}
+config.sh: ${.CURDIR}/../../libperl/config.SH-${OBJFORMAT}.${MACHINE_ARCH}
 	@ln -sf ${.OODATE} ${.TARGET}
 
 config_h.sh: ${PERL5SRC}/config_h.SH