[commit] r2356 - tags/replimenu/replimenu-0.9

[Ewan Meadows]

Oops, what would be the best way to correct this?

svn merge -r 2357:2355
svn+ssh://dslinux-svn/svnroot/tags/replimenu/replimenu-0.9


2008/10/26 Stefan Sperling <stsp at stsp.name>:
> On Sun, Oct 26, 2008 at 12:23:15PM +0100, dslinux_sonny_jim at dslinux.in-berlin.de wrote:
>> Author: dslinux_sonny_jim
>> Date: Sun Oct 26 12:23:14 2008
>> New Revision: 2356
>>
>> Log:
>> Patching replimenu for DSLinux
>
> You sure you wanted to do this in tags/ instead of trunk/ ?
>
>>
>>
>> Modified:
>>    tags/replimenu/replimenu-0.9/Makefile
>>    tags/replimenu/replimenu-0.9/configuration
>     ^^^^
>
> Stefan
>>
>> Modified: tags/replimenu/replimenu-0.9/Makefile
>> ==============================================================================
>> --- tags/replimenu/replimenu-0.9/Makefile     (original)
>> +++ tags/replimenu/replimenu-0.9/Makefile     Sun Oct 26 12:23:14 2008
>> @@ -102,3 +102,5 @@
>>       @echo ; \
>>       echo -e "\033[1mDone.\033[0m" ; \
>>       echo
>> +romfs:
>> +     $(ROMFSINST) src/replimenu /bin/replimenu
>>
>> Modified: tags/replimenu/replimenu-0.9/configuration
>> ==============================================================================
>> --- tags/replimenu/replimenu-0.9/configuration        (original)
>> +++ tags/replimenu/replimenu-0.9/configuration        Sun Oct 26 12:23:14 2008
>> @@ -10,7 +10,7 @@
>>  # To build against uClibc, just change "CC" to the uClibc wrapper e.g.
>>  # "/usr/local/uclibc/bin/i386-uclibc-gcc".
>>  #
>> -CC=gcc
>> +#CC=gcc
>>
>>  # Make utility.
>>  #
>> @@ -22,8 +22,8 @@
>>
>>  # Whether to build a static binary or not.
>>  #
>> -DOSTATIC=false
>> -#DOSTATIC=true
>> +#DOSTATIC=false
>> +DOSTATIC=true
>>
>>  # Where to install replimenu...
>>  #
>> @@ -45,8 +45,8 @@
>>
>>  # General compiler options.
>>  #
>> -CFLAGS = -Wall -Wshadow -O2
>> -LDFLAGS = -s
>> +#CFLAGS = -Wall -Wshadow -O2
>> +#LDFLAGS = -s
>>
>>  # Makefile specific.
>>  #
>> --
>> dslinux-commit mailing list
>> dslinux-commit at dslinux.in-berlin.de
>> http://mailman.dslinux.in-berlin.de/mailman/listinfo/dslinux-commit-dslinux.in-berlin.de
> --
> dslinux-devel mailing list
> dslinux-devel at dslinux.in-berlin.de
> http://mailman.dslinux.in-berlin.de/mailman/listinfo/dslinux-devel-dslinux.in-berlin.de
>